1b5937c06b
merge changes for storm-1618
2011-09-21 13:49:32 -04:00
83732a7083
SH-2445 Potential fix for crash in LLCurl::Multi::~Multi -- lock sMultiMutex around curl_multi_ calls in LLCurl::Multi destructor
2011-09-19 16:39:16 -05:00
e85ae35ff9
merge changes for storm-1608
2011-09-19 16:59:01 -04:00
1911586ce4
storm-1610
2011-09-19 16:58:21 -04:00
9ac33479aa
merge changes for storm-1609
2011-09-19 16:57:20 -04:00
aa45b6e480
VWR-26942: back out 6a0e0684e7af
2011-09-19 14:48:19 -04:00
be6e26de42
VWR-26937 FIX FR linguistic, re-commit
2011-09-16 11:51:57 -07:00
48dd723024
sync with viewer-development
2011-09-16 11:49:00 -07:00
77eb3aae04
SH-2440 FIX - first build, then test, then commit
2011-09-16 13:14:30 -04:00
832ed49f5b
SH-2440 FIX - avoid calling initInstance() on LLVOAvatarSelf if it already exists
2011-09-16 13:03:10 -04:00
2fba01d160
merge changes for storm-1578
2011-09-16 09:07:20 -04:00
1a0865a572
merge
2011-09-15 21:36:39 -04:00
1d3f6ef432
EXP-1215 FIX -- New tag toggles on and off during delivery of large purchases
...
EXP-1216 FIX -- Not all inbox items are sorted properly for large item purchases
* The inventory listener is no longer used to override the folder's creation
date if the date it has is zero.
2011-09-15 16:13:10 -07:00
6e5ff42f9e
VWR-26937 FIX FR linguistic
2011-09-15 14:22:50 -07:00
92fa144dce
merge
2011-09-15 16:09:17 -04:00
c1f211cac1
merge changes for storm-1599
2011-09-15 15:28:11 -04:00
daf0b047fa
merge changes for storm-1595
2011-09-15 15:27:42 -04:00
d3c05d52e5
merge changes for storm-1585
2011-09-15 15:27:13 -04:00
3981afe7fd
pulled back release tags
2011-09-15 15:26:43 -04:00
11dce3b74d
reconciled .hgtags
2011-09-15 14:32:55 -04:00
671a76b40c
Added tag DRTVWR-89_3.0.3-beta2, 3.0.3-beta2 for changeset 61aa7974df08
2011-09-15 14:30:19 -04:00
caa65cefe2
merge
2011-09-15 13:30:15 -04:00
556cd3a53b
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-14 19:47:37 -07:00
254eb36543
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-09-14 19:46:16 -07:00
2809778bf1
EXP-1201 FIX Quit button option not present in Mode Changing and Exit viewer dialogs
2011-09-14 19:45:00 -07:00
6a2eda0f34
EXP-1199 FIX -- Inbox new tag sometimes differs from recent item delivery times, sim timezone settings differences suspected.
...
* Put 7 hour time difference back in to account for PDT vs GMT inventory server time
2011-09-14 16:42:00 -07:00
088f04d9c1
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-09-14 10:51:00 -07:00
8b7c07651c
improved fast timers display
...
can move and resize
better visualization of timer history
can click drag to browse history
increased frame history to 300
2011-09-14 10:50:32 -07:00
7a60aa91f4
merge changes for storm-1562
2011-09-14 13:39:33 -04:00
758b936dea
Trying to fix Mac build issue
2011-09-14 13:24:31 -04:00
11340e3eb3
merge possible fix for storm-1562
2011-09-14 11:21:53 -04:00
a3e092db14
STORM-1578 (viewer side only), STORM-1589
...
Remove the viewer side automatic logout after extended away time.
Note, however, that the server still logs you out after 30 minutes
away: see SVC 7251.
Allow more time (10 seconds vs 2 seconds) after initiating Away status
during which mouse movements do not remove the Away status.
2011-09-14 08:54:07 -04:00
b2d20f5a98
merge changes for storm-1532
2011-09-14 08:33:25 -04:00
1d510b73ff
sync with viewer-development
2011-09-13 19:16:02 -07:00
349112a662
sync with viewer-development
2011-09-13 19:14:36 -07:00
e78fda0084
sync with viewer-development
2011-09-13 19:14:24 -07:00
7f11cff797
Merge from viewer-experience-merge
2011-09-13 14:42:33 -07:00
781fded069
EXP-1010 FIX -- Received Items panel scroll snaps to current selection when Direct Delivery folders with a large # of items are being delivered from Marketplace
...
* Updated the inventory filter isNotDefault() function to properly check the
filter types and filter links flags against the default filter ops.
* Updated the inbox and outbox to mark their date sort order as the default.
Reviewed by Leyla.
2011-09-13 14:26:02 -07:00
961c4d3816
merge changes for 3.0.3 beta 2 fixes
2011-09-13 14:47:34 -04:00
201d065919
EXP-1071 FIX -- User can drag items to Received Items folder under Recent Tab
...
* Inventory panel now has an optional "accepts_drag_and_drop" parameter set to
true by default.
* Recent Inventory Panel sets "accepts_drag_and_drop" to false.
* Items can still be dragged out of Recent to a second inventory panel.
Reviewed by Leyla.
2011-09-13 11:17:02 -07:00
19371a9abe
STORM-1562 Potential fix for crash in LLCurl::run -- make sure all ref counted members of llsecapi are thread safe
2011-09-13 13:09:10 -05:00
3f4a063758
increased fast timer history to 300 to make fast timers more usable
2011-09-13 10:58:51 -07:00
0a0ae2dd3f
STORM-1562 Potential fix for crash in LLCurl::run -- don't run curl_multi_perform from multiple threads simultaneously.
2011-09-13 12:45:28 -05:00
2c03ee82ec
STORM-1599 FIXED Scrolling search history with mouse wheel now doesn't zoom the wold view upon reaching the end of list.
2011-09-13 18:41:15 +03:00
a21aa5509d
STORM-1595 FIXED Removing a wrong debug assertion.
2011-09-13 16:59:30 +03:00
aa75136e1a
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-09-12 18:01:26 -07:00
860962d365
EXP-1063 FIX Destination Guide link in side panel does not open to destination guide specific search window
...
fixed param->LLSD serialization to not introduce empty strings
2011-09-12 18:00:52 -07:00
8ed52654d0
STORM-1585 FIXED Duplicated/missing XUI IDs in floater_preferences_proxy.xml.
2011-09-13 03:47:27 +03:00
ba96fb5c2b
EXP-1199 FIX -- Inbox new tag sometimes differs from recent item delivery times, sim timezone settings differences suspected.
...
* LastInventoryInboxActivity setting now stored as the value of time_correct(),
the corrected time difference (established at login) between the client and
official SL time.
2011-09-12 16:06:58 -07:00
97d03860fc
EXP-1200 FIX -- Newness Badge shows in UI when dragging Inventory tab to undock
...
* Sidetab buttons now have their visibility toggled when they are not displayed.
* Sidetab passes visibility to its corresponding badge, if one exists.
2011-09-12 14:33:41 -07:00
Oz Linden