completed: Tue Jan 11 18:05:09 2011
. [ default ] . changeset: 14461:0ba171198594 . tag: tip . parent: 14437:409e527b267c . parent: 14460:22684a90f4b7 . user: Merov Linden <merov@lindenlab.com> . date: Tue Jan 11 09:03:18 2011 -0800 . summary: STORM-807 : pull into viewer-development . . [ default ] . . changeset: 14460:22684a90f4b7 . . 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 . . changeset: 14459:94cd40084e39 . . parent: 14458:a6dc92b40f43 . . parent: 14456:91572fa89a95 . . user: Andrew Meadows <andrew@lindenlab.com> . . date: Fri Jan 07 15:22:33 2011 -0800 . . summary: merge . . . [ default ] . . . changeset: 14456:91572fa89a95 . . . parent: 14455:f8c793d4214b . . . parent: 14347:43cf4a37774c . . . user: Andrew Meadows <andrew@lindenlab.com> . . . date: Wed Dec 29 12:39:58 2010 -0800 . . . summary: merge . . . changeset: 14455:f8c793d4214b . . . parent: 14454:a4b0f72a8428 . . . parent: 14453:ba6d29a97383 . . . user: Andrew Meadows <andrew@lindenlab.com> . . . date: Wed Dec 29 11:56:28 2010 -0800 . . . summary: merge . . . . [ default ] . . . . changeset: 14453:ba6d29a97383 . . . . 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. . . . . changeset: 14452:62a49ded5d10 . . . . parent: 14451:957a5a86fc7d . . . . parent: 14450:356463c07f65 . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . date: Wed Dec 22 10:28:16 2010 -0800 . . . . summary: merge . . . . . [ default ] . . . . . changeset: 14450:356463c07f65 . . . . . parent: 14449:ba91fa7a08dc . . . . . parent: 14181:fc82190a3f0c . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . date: Wed Dec 22 09:54:45 2010 -0800 . . . . . summary: merge . . . . . changeset: 14449:ba91fa7a08dc . . . . . 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. . . . . . changeset: 14448:c3685093b3bb . . . . . 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 . . . . . changeset: 14447:951514a958b4 . . . . . 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 . . . . . changeset: 14446:7fdc0b9843a7 . . . . . parent: 14445:c502fc0874b3 . . . . . parent: 14443:9dfbf1158ef7 . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . date: Wed Dec 15 08:05:51 2010 -0800 . . . . . summary: Another merge . . . . . . [ default ] . . . . . . changeset: 14443:9dfbf1158ef7 . . . . . . 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? . . . . . . changeset: 14442:24b93568da3c . . . . . . parent: 14440:2d93cb1fb361 . . . . . . parent: 13740:24ff7db40509 . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . date: Fri Dec 10 10:40:38 2010 -0800 . . . . . . summary: merge . . . . . . changeset: 14440:2d93cb1fb361 . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . date: Fri Nov 19 08:36:53 2010 -0800 . . . . . . summary: Fixing a typo that broke the build. . . . . . . changeset: 14439:5ab7c6ca57e2 . . . . . . 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 . . . . . . changeset: 14438:3f36cc8e1743 . . . . . . parent: 13508:03e89ba6cd9f . . . . . . parent: 13491:7ed69ee6377d . . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . . date: Tue Nov 16 07:01:11 2010 -0800 . . . . . . summary: merge . . . . . [ default ] . . . . . changeset: 14445:c502fc0874b3 . . . . . parent: 14444:71f6586b0c18 . . . . . parent: 14441:fbfc8c5a50ab . . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . . date: Wed Dec 15 08:03:49 2010 -0800 . . . . . summary: merge . . . . . . [ default ] . . . . . . changeset: 14441:fbfc8c5a50ab . . . . . . 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 . . . . . [ default ] . . . . . changeset: 14444:71f6586b0c18 . . . . . parent: 14442:24b93568da3c . . . . . 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 . . . . [ default ] . . . . changeset: 14451:957a5a86fc7d . . . . parent: 14181:fc82190a3f0c . . . . user: Andrew Meadows <andrew@lindenlab.com> . . . . date: Wed Dec 22 10:06:36 2010 -0800 . . . . summary: removing some very old debug spam . . . [ default ] . . . changeset: 14454:a4b0f72a8428 . . . parent: 14449:ba91fa7a08dc . . . parent: 14181:fc82190a3f0c . . . user: Andrew Meadows <andrew@lindenlab.com> . . . date: Wed Dec 22 09:36:12 2010 -0800 . . . summary: merge . . [ default ] . . changeset: 14458:a6dc92b40f43 . . parent: 14457:f3ff2aab7984 . . parent: 14430:78fae8ca1b36 . . user: Andrew Meadows <andrew@lindenlab.com> . . date: Fri Jan 07 15:22:22 2011 -0800 . . summary: merge . . changeset: 14457:f3ff2aab7984 . . parent: 14442:24b93568da3c . . parent: 14441:fbfc8c5a50ab . . 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. . [ default ] . changeset: 14437:409e527b267c . parent: 14435:bceb13778d1d . parent: 14436:76f586a8e22b . user: Merov Linden <merov@lindenlab.com> . date: Mon Jan 10 15:10:11 2011 -0800 . summary: pull from viewer-beta . . [ default ] . . changeset: 14436:76f586a8e22b . . parent: 14429:6ba181f44396 . . user: callum . . date: Mon Jan 10 10:32:36 2011 -0800 . . summary: SOCIAL-437 FIX Viewer crashes opening My Profile panel