203da72c5f
Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internal
2013-03-28 18:08:11 -04:00
cfd35b8b22
Made a bug that was masking the warning about mismatched caps coming from a region. They could never match because certain capabilities are explicitly not stored when we receive them.
...
* Made mSecondCapabilitiesTracker set capabilities in a way that more closely matches mCapabilities so that they will match up when we get a second cap grant from a region if the caps that were sent are actually the same.
* Added more logging around setting a region's seed capability.
* Also added a static function in llviewerregion to dump out a CapabilityMap based on the logActiveCapabilities method. Defined the old method in terms of the new static free function.
2013-03-28 18:07:54 -04:00
d02296d51b
pulling in sunshine-stable
2013-03-27 15:32:13 +00:00
ec525704e9
SH-4034 FIX Outfit changes broadcast without exiting appearance edit mode
...
Backing out MAINT-1099 fix. Added line causes us to temporarily exit and re-enter
outfit editing mode every time we edit a wearable, which has a host of unintended
consequences. Reviewed the original bug, and their fix should not have any
impact on the original bug.
Repro of the original bug does not repro, with or without the patch. The patch
causes regressions but not fixes so removing it. Will send MAINT-1099 back
to QA for verification - there is an alternate solution if this causes a regression.
2013-03-25 18:29:01 -04:00
41100ac9d3
SH-3850 WIP - fixed some warnings
2013-03-22 13:55:39 -04:00
144194b833
SH-3850 WIP - added some additional debugging output to try to catch gray textures
2013-03-22 13:48:27 -04:00
1a75ba1f74
Disabled QAModeMetrics by default, prior to general release
2013-03-22 12:24:31 -04:00
b3fc393d16
SH-4001 FIX - made local texture loading universal.
2013-03-22 12:21:24 -04:00
de2c88ca43
Moved LastUpdateCOF stuff to avatar, so we can track last received for non-self avs
2013-03-22 12:17:06 -04:00
f345746161
Folded in changes from sunshine-stable
2013-03-21 11:21:45 -04:00
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05:00
4a2fb4c64f
CHUI-873 FIXED [CHUIBUG]Torn off nearby chat with message panel hidden has huge bottom padding when opening in mouselook mode
2013-03-20 22:27:16 +02:00
a48cd164a2
CHUI-857 Nearby chat opens as torn off on first login: changed initial setting for nearby chat docked state
2013-03-20 21:51:36 +02:00
33954bbbe5
merging in changes from sunshine-stable
2013-03-20 12:15:27 -04:00
779e132cbf
merge
2013-03-20 12:04:55 -04:00
38970de543
SH-3978 FIX Unsaved changes/save options not shown after adding new pants.
...
UI was incorrectly assuming that saving a wearable meant that the outfit
did not need to be saved as well. Updated panel switching to actually
check whether the outfit matches the base outfit.
2013-03-20 12:04:26 -04:00
5c19f15dca
Removed avatar stuff from asset metrics, again. Must have gotten broken in a merge at some point.
2013-03-20 11:43:34 -04:00
cee1a311ad
CHUI-870 FIXED Expand Message panel after clicking toast.
2013-03-20 15:41:57 +02:00
78e0dc5aa3
CHUI-860 FIXED Don't call onSlide() to change Participant list's state
2013-03-20 15:30:27 +02:00
5187f5b41f
CHUI-869 FIXED Clicking on toast will restore Message pane.
2013-03-20 15:08:02 +02:00
72af9ed2e3
merge
2013-03-20 11:10:46 +02:00
2a8baeed3a
CHUI-843 ([CHUIBUG]Suggested alteration to toolbar_panel in floater_im_container in CHUI): Adjusted button layout in conversation floater.
2013-03-19 16:46:04 -07:00
626cb63199
Fixing booking issues in inventory background fetching (especially when caps are not resolved)
2013-03-19 20:19:40 +00:00
c4f283334c
CHUI 796 (User doesn't get all messages in 'do not disturb' mode): Now IM DND notifications will be stored as p2p, ad-hoc or group. When loading these notifications upon app start ad-hoc/group notifications will launch the conversation log and play a sound.
2013-03-19 11:34:13 -07:00
c7a7347a42
still more build failure fixing
2013-03-19 09:34:58 -04:00
0c5ff7eb48
CHUI-812 ([CHUIBUG]Resizing "Nearby chat" window creates confusing layout)
2013-03-19 10:57:38 +02:00
f2ddebe431
merge
2013-03-18 15:57:26 -07:00
73f68342f6
CHUI-864 ([crashhunters] crash in LLConversationLog): Found a probable cause. It is likely that the user was missing the user settings variable called 'KeepConversationLogTranscripts.' If this variable doesn't exist or is deleted then the CHUI viewer would try to extract data from this non-existent variable. Resolution, now perform a check to make sure the 'KeepConversationLogTranscripts' settings variable exists before extracting data.
2013-03-18 15:56:50 -07:00
262549ce37
merge
2013-03-18 18:45:08 -04:00
6fe9886133
SH-3980 FIX - fixed most cases of server-bake blurring by disabling caching of server bakes. A better solution is desirable, may not be for initial release
2013-03-18 18:44:21 -04:00
cec27955ec
merge
2013-03-18 18:11:28 -04:00
d41e1cf171
Fix for sh-4014. This was a regression caused by fix for sh-3650.
2013-03-18 18:10:40 -04:00
e98b0c43bc
merge
2013-03-18 23:01:31 +01:00
ea9a71972d
Fix for build error
2013-03-18 17:00:48 -04:00
a365d7fb3f
more urgent notification (DEBUG->WARN) for some texture fetch error cases
2013-03-18 16:41:42 -04:00
22203b43db
CHUI-826 FIX [CHUIBUG]User nametags (nametag floaters) intermittently disappear in CHUI builds.
...
Added check in LLVOAvatar::idleUpdateNameTagText() to account for case where mNameString is literally "" (two quotes)
2013-03-18 20:06:25 +01:00
7d1bd682cd
cut back log spam
2013-03-18 13:38:13 -04:00
a17ed876c8
merge
2013-03-18 09:43:16 -07:00
409e9202dd
merge
2013-03-18 11:46:12 -04:00
605a99010f
merge
2013-03-18 11:39:21 -04:00
34181d1566
BUILDFIX new appearance utility src for fixing a runtime error
2013-03-18 11:36:37 -04:00
a079acf1aa
CHUI-861 FIXED "Animate" param is set false.
2013-03-18 16:02:09 +02:00
8e1c21bf70
CHUI-830 Icons uploaded
2013-03-18 14:51:38 +02:00
bc8ac5854f
CHUI-620 FIXED Clear the highlight when auto-selecting new conversation or when text is entered into the message panel.
2013-03-18 14:37:21 +02:00
c294c7c474
CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux
2013-03-16 16:09:50 -07:00
0a0ba068bf
CHUI-852 ([crashhunters] crash in LLNotificationsUI::LLScreenChannel::addToast): Crash is due to a gesture not loading while the user is shutting down the app. A notification saying that the gesture couldn't load is trying to display while the app is shutting down, which causes a crash.
2013-03-15 18:16:44 -07:00
e8b22d3299
Pull merge from lindenlab/viewer-chui
2013-03-15 17:57:48 -07:00
242c39f24b
CHUI-807 : More defensive code. Don't assume anything while iterating through panels.
2013-03-15 17:54:16 -07:00
e288ff9695
SH-3850 WIP, SH-3959 WIP - added additional debug logging for texture loading
2013-03-15 13:26:31 -04:00
780fe4e37f
CHUI-831 ADD FIX Minimized conversation floater is not opened with Open Conversation Window preference if conversation receiving message is selected
2013-03-15 17:39:09 +02:00
Logan Dethrow