Ignored revisions: 12346
Ignoring 2089 ancestors included in old builds.
included in: 218779
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14461">14461:0ba171198594</a>
tag:         tip
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14437">14437:409e527b267c</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14460">14460:22684a90f4b7</a>
user:        Merov Linden <merov@lindenlab.com>
date:        Tue Jan 11 09:03:18 2011 -0800
summary:     STORM-807 : pull into viewer-development

included in: 218779
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14460">14460:22684a90f4b7</a>
user:        Merov Linden <merov@lindenlab.com>
date:        Mon Jan 10 18:01:16 2011 -0800
summary:     STORM-807 : Clean up code as discussed with Andrew

included in: 218779
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14459">14459:94cd40084e39</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14458">14458:a6dc92b40f43</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14456">14456:91572fa89a95</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Fri Jan 07 15:22:33 2011 -0800
summary:     merge

codeticket:  217921
included in: 218779
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14456">14456:91572fa89a95</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14455">14455:f8c793d4214b</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14347">14347:43cf4a37774c</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Wed Dec 29 12:39:58 2010 -0800
summary:     merge

codeticket:  217912
included in: 217921
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14455">14455:f8c793d4214b</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14454">14454:a4b0f72a8428</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14453">14453:ba6d29a97383</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Wed Dec 29 11:56:28 2010 -0800
summary:     merge

codeticket:  217770
included in: 217912
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14453">14453:ba6d29a97383</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Wed Dec 22 10:47:18 2010 -0800
summary:     Setting viewer version numbers back to what they were as per Merov's review request.

included in: 217770
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14452">14452:62a49ded5d10</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14451">14451:957a5a86fc7d</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14450">14450:356463c07f65</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Wed Dec 22 10:28:16 2010 -0800
summary:     merge

included in: 217770
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14450">14450:356463c07f65</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14449">14449:ba91fa7a08dc</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14181">14181:fc82190a3f0c</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Wed Dec 22 09:54:45 2010 -0800
summary:     merge

codeticket:  217356
included in: 217770
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14449">14449:ba91fa7a08dc</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Mon Dec 20 09:03:59 2010 -0800
summary:     Fixing windows build error about inequality comparison between S32 and U32.

codeticket:  217336
included in: 217356
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14448">14448:c3685093b3bb</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Fri Dec 17 19:52:45 2010 -0800
summary:     For object-vs-parcel overlap we now use list of axis aligned boxes

codeticket:  217007
included in: 217336
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14447">14447:951514a958b4</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Wed Dec 15 11:23:00 2010 -0800
summary:     ER-407 child bounding boxes not rotated properly for encroachment returnability

codeticket:  216993
included in: 217007
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14446">14446:7fdc0b9843a7</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14445">14445:c502fc0874b3</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14443">14443:9dfbf1158ef7</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Wed Dec 15 08:05:51 2010 -0800
summary:     Another merge

codeticket:  216633
included in: 216993
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14443">14443:9dfbf1158ef7</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Fri Dec 10 21:00:58 2010 -0800
summary:     Sigh... another fix for ER-343.  Or maybe I forgot to commit the first time?

codeticket:  216566
included in: 216633
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14442">14442:24b93568da3c</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14440">14440:2d93cb1fb361</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/13740">13740:24ff7db40509</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Fri Dec 10 10:40:38 2010 -0800
summary:     merge

codeticket:  215119
included in: 216566
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14440">14440:2d93cb1fb361</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Fri Nov 19 08:36:53 2010 -0800
summary:     Fixing a typo that broke the build.

codeticket:  215099
included in: 215119
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14439">14439:5ab7c6ca57e2</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Thu Nov 18 15:55:53 2010 -0800
summary:     Added viewer-side "object overlaps parcel" check encroachment returnabilty UI

codeticket:  214763
included in: 215099
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14438">14438:3f36cc8e1743</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/13508">13508:03e89ba6cd9f</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/13491">13491:7ed69ee6377d</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Tue Nov 16 07:01:11 2010 -0800
summary:     merge

included in: 216993
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14445">14445:c502fc0874b3</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14444">14444:71f6586b0c18</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14441">14441:fbfc8c5a50ab</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Wed Dec 15 08:03:49 2010 -0800
summary:     merge

codeticket:  216208
included in: 216993
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14441">14441:fbfc8c5a50ab</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Mon Dec 06 15:47:35 2010 -0800
summary:     ER-343 viewer UI does not correctly enable/disable object return

codeticket:  216804
included in: 216993
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14444">14444:71f6586b0c18</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14442">14442:24b93568da3c</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Tue Dec 14 08:52:33 2010 -0800
summary:     ER-398 viewer's encroachment logic only uses bounding box of root prim

included in: 217770
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14451">14451:957a5a86fc7d</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14181">14181:fc82190a3f0c</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Wed Dec 22 10:06:36 2010 -0800
summary:     removing some very old debug spam

included in: 217912
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14454">14454:a4b0f72a8428</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14449">14449:ba91fa7a08dc</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14181">14181:fc82190a3f0c</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Wed Dec 22 09:36:12 2010 -0800
summary:     merge

included in: 218779
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14458">14458:a6dc92b40f43</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14457">14457:f3ff2aab7984</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14430">14430:78fae8ca1b36</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Fri Jan 07 15:22:22 2011 -0800
summary:     merge

included in: 218779
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14457">14457:f3ff2aab7984</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14442">14442:24b93568da3c</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14441">14441:fbfc8c5a50ab</a>
user:        Andrew Meadows <andrew@lindenlab.com>
date:        Fri Jan 07 15:20:11 2011 -0800
summary:     Adding group owned check for enabling returnability of objects on parcels.

included in: 218779
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14437">14437:409e527b267c</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14435">14435:bceb13778d1d</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14436">14436:76f586a8e22b</a>
user:        Merov Linden <merov@lindenlab.com>
date:        Mon Jan 10 15:10:11 2011 -0800
summary:     pull from viewer-beta

codeticket:  218716
included in: 218779
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14436">14436:76f586a8e22b</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14429">14429:6ba181f44396</a>
user:        callum
date:        Mon Jan 10 10:32:36 2011 -0800
summary:     SOCIAL-437 FIX Viewer crashes opening My Profile panel

codeticket:  218631
included in: 218779
changeset:   <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14435">14435:bceb13778d1d</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14434">14434:93874c3d90fd</a>
parent:      <a href="http://bitbucket.org/lindenlab/viewer-development/changeset/14433">14433:ee57e4400313</a>
user:        Oz Linden <oz@lindenlab.com>
date:        Fri Jan 07 16:45:04 2011 -0500
summary:     merge changes for vwr-1095

</pre></body></html>