ceee22b0bb
Merge
2011-06-23 15:50:02 -04:00
e7d86046d9
Build fixes from the merge.
...
Recommended by Richard.
2011-06-23 15:49:16 -04:00
4ebf8e3abc
fix for gcc build
2011-06-23 12:02:59 -07:00
af142618f9
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-06-23 11:35:14 -07:00
70fc5af53f
Automated merge with http://hg.secondlife.com/viewer-development
2011-06-23 11:28:23 -07:00
715cb3cc0c
Automated merge with ssh://hg.lindenlab.com/leyla/viewer-experience-dd
2011-06-23 10:57:41 -07:00
c61a7fbaac
EXP-926 FIX -- Received items badge count and item count shown in inbox do not always match
...
* getFreshItemCount() function returns getTotalItemCount() for now, until we properly support
item fresh-ness
2011-06-23 10:34:44 -04:00
b343d25d19
merge changes for storm-1437
2011-06-23 09:47:43 -04:00
ae2cbe5258
EXP-923 FIX Landmarks moved to new folders do not show as moved until relog in viewer - Delete, Copy, and Paste functions not working as well
2011-06-22 19:18:41 -07:00
b84881382b
merge and fixing linux build issues
2011-06-22 16:18:23 -07:00
5999574c10
making it so that inbox shows up quicker
2011-06-22 16:12:01 -07:00
4267014b14
EXP-890 FIX -- Resizing inbox or outbox to minimum size while open does not show present items when hte box is next opened
...
EXP-897 FIX -- Black box shown in UI when shrinking Inbox down in size
* Layout panel now supports "expanded_min_dim" parameter which allows a different min
size to be specified when the layout panel is collapsed vs expanded.
* Inbox and Outbox expanded_min_dim attributes are now set to be larger than min dim
so they can not be collapsed all the way when they are expanded.
2011-06-22 17:35:25 -04:00
21cc9a2868
EXP-919 FIX 2 -- Toggling InventoryDisplayInbox value to True in Viewer on Agni creates Inbox and Outbox system folders
...
* Fixed the "start_in" folder tag to no longer create folders it is trying to track that do not exist.
2011-06-22 17:02:11 -04:00
8737446eb7
EXP-919 FIX -- Toggling InventoryDisplayInbox value to True in Viewer on Agni creates Inbox and Outbox system folders
...
* The code should no longer create these folders when querying for them.
Reviewed by Richard
2011-06-22 14:28:19 -04:00
57017a7a6e
EXP-920 FIX -- Received Items panel is not opened if closed when a new Direct Delivery items is delivered when user has Inventory panel open
...
* Mac build fix by removing an unused variable
* Inbox panel now auto-expands when new item delivered
Reviewed by Richard
2011-06-22 14:26:15 -04:00
74e8f5a7c5
Merge
2011-06-22 11:17:36 -07:00
f657e8e16f
remove error from build logs by taking out obsolete param (cg said this was ok to do)
2011-06-22 11:37:46 -04:00
c8232b6595
update codeticket configuration for my review builds
2011-06-22 11:36:52 -04:00
a5474e3398
remove a bunch of builds that are no longer needed
2011-06-22 11:30:18 -04:00
9a2e35f7ca
merge changes for storm-1421
2011-06-22 08:30:59 -04:00
80b81279a2
CHOP-662 Merged into viewer-development-crash-horde
2011-06-21 21:42:32 -07:00
84c44b8f8e
STORM-1368 Merge with veiewer-development-crash-horde
2011-06-21 21:40:54 -07:00
8c65351250
Pulled from viewer development
2011-06-21 20:50:16 -07:00
14105610c7
CHOP-662 cleanup in response to code review.
2011-06-21 20:46:32 -07:00
c0fa40141b
FIX VWR-25160 en_xui_change
2011-06-21 16:15:58 -07:00
54195e8125
FIX VWR-25159
2011-06-21 16:07:28 -07:00
2a3a01dcc9
FIX VWR-25118
2011-06-21 15:40:13 -07:00
e2f9276a08
EXP-877 Profile button not active when selecting items in Marketplace inbox
2011-06-21 15:18:05 -07:00
1e87fc43d7
Fix for memory leak & extra inventory observers in start_new_inventory_observer. Reviewed by Richard
2011-06-21 14:57:02 -07:00
917e2d1897
EXP-895 Selecting items in Marketplace Inbox does not change focus in inventory panel away from items selected in inventory panel
2011-06-21 14:16:27 -07:00
00da6b3501
merged back tags and late changes from viewer-pre-beta
2011-06-21 16:58:31 -04:00
687a925fda
pull late release change back from viewer-pre-release
2011-06-21 16:57:27 -04:00
192f51f426
pull back tags from viewer-release
2011-06-21 16:14:10 -04:00
ed684fb2ed
FIX VWR-25072
2011-06-21 12:00:08 -07:00
6977c09a88
FIX VWR-25071
2011-06-21 11:58:54 -07:00
fcf2ed5901
merged .hgtags & BuildParams
2011-06-21 11:47:58 -04:00
4d77146b90
Added tag 2.7.4-start for changeset 6af10678de47
2011-06-21 07:25:19 -04:00
1c5584be55
merge
2011-06-20 18:17:05 -07:00
658fdbb4df
EXP-872 Hide inbox unless applicable
2011-06-20 18:14:36 -07:00
149b160a6d
EXP-872 Hide inbox unless applicable
2011-06-20 18:14:26 -07:00
941a360c46
EXP-893 FIX Single order purchases not sorted with most recent item delivered at top of list
...
reviewed by Leyla
2011-06-20 18:03:58 -07:00
83b4eb2201
SH-1618 isFullbright causes AvatarEyes GL shader to fail to link.
2011-06-20 16:42:31 -07:00
a975df88f0
Added change to contributions.txt to get code review to work
2011-06-20 16:30:48 -07:00
f02dc7e1b6
CHOP-662 Coupl of fixes to extended unit-test
2011-06-20 12:17:25 -07:00
47c49b5bc5
sync with viewer-development
2011-06-20 11:22:02 -07:00
aa15185bc8
Chop-662 - fixes to deal with cleanly moving between the glob and regex world
2011-06-20 11:18:26 -07:00
306759835d
Added more tests to cover the common examples in the crash logs
2011-06-20 11:07:17 -07:00
4ba2a80148
fixed build on mac/linux
2011-06-20 11:02:36 -07:00
015db564cf
EXP-915 FIX remove mHidden and mStartFolderID from LLFolderView*
...
removed mHidden variable
2011-06-20 11:00:02 -07:00
b9b1500979
SH-1618 Fix for shaders being disabled on mac due to switch statement in indexed texture rendering code.
2011-06-20 11:55:22 -05:00
Leslie Linden