summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-02Renamed logCapabilites static function to log_capabilities in ↵Logan Dethrow
llviewerregion.cpp to better match coding standard.
2013-04-01If we get more caps from a subsequent grant for a region, go ahead and use ↵Logan Dethrow
them. This is a hack that should be safe to remove after SH-3895 is fixed everywhere on the sim side.
2013-04-01Backed out accidentally committed change to logcontrol.xml.Logan Dethrow
2013-03-28Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internalLogan Dethrow
2013-03-28Made a bug that was masking the warning about mismatched caps coming from a ↵Logan Dethrow
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-27pulling in sunshine-stableNyx Linden
2013-03-25SH-4034 FIX Outfit changes broadcast without exiting appearance edit modeNyx Linden
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-22SH-3850 WIP - fixed some warningsBrad Payne (Vir Linden)
2013-03-22SH-3850 WIP - added some additional debugging output to try to catch gray ↵Brad Payne (Vir Linden)
textures
2013-03-22Disabled QAModeMetrics by default, prior to general releaseBrad Payne (Vir Linden)
2013-03-22SH-4001 FIX - made local texture loading universal.Brad Payne (Vir Linden)
2013-03-22Moved LastUpdateCOF stuff to avatar, so we can track last received for ↵Brad Payne (Vir Linden)
non-self avs
2013-03-21Folded in changes from sunshine-stableprep
2013-03-20Merge with viewer-chuiprep@lindenlab.com
2013-03-20CHUI-873 FIXED [CHUIBUG]Torn off nearby chat with message panel hidden has ↵maksymsproductengine
huge bottom padding when opening in mouselook mode
2013-03-20CHUI-857 Nearby chat opens as torn off on first login: changed initial ↵AlexanderP ProductEngine
setting for nearby chat docked state
2013-03-20merging in changes from sunshine-stableNyx Linden
2013-03-20mergeNyx Linden
2013-03-20SH-3978 FIX Unsaved changes/save options not shown after adding new pants.Nyx Linden
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-20Removed avatar stuff from asset metrics, again. Must have gotten broken in a ↵Brad Payne (Vir Linden)
merge at some point.
2013-03-20CHUI-870 FIXED Expand Message panel after clicking toast.Mnikolenko ProductEngine
2013-03-20CHUI-860 FIXED Don't call onSlide() to change Participant list's stateMnikolenko ProductEngine
2013-03-20CHUI-869 FIXED Clicking on toast will restore Message pane.Mnikolenko ProductEngine
2013-03-20mergemberezhnoy
2013-03-19CHUI-843 ([CHUIBUG]Suggested alteration to toolbar_panel in ↵Gilbert Gonzales
floater_im_container in CHUI): Adjusted button layout in conversation floater.
2013-03-19Fixing booking issues in inventory background fetching (especially when caps ↵Don Kjer
are not resolved)
2013-03-19CHUI 796 (User doesn't get all messages in 'do not disturb' mode): Now IM ↵Gilbert Gonzales
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-19still more build failure fixingBrad Payne (Vir Linden)
2013-03-19CHUI-812 ([CHUIBUG]Resizing "Nearby chat" window creates confusing layout)mberezhnoy
2013-03-18mergeGilbert Gonzales
2013-03-18CHUI-864 ([crashhunters] crash in LLConversationLog): Found a probable ↵Gilbert Gonzales
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-18mergeBrad Payne (Vir Linden)
2013-03-18SH-3980 FIX - fixed most cases of server-bake blurring by disabling caching ↵Brad Payne (Vir Linden)
of server bakes. A better solution is desirable, may not be for initial release
2013-03-18mergeprep
2013-03-18Fix for sh-4014. This was a regression caused by fix for sh-3650.prep
2013-03-18mergeCho
2013-03-18Fix for build errorBrad Payne (Vir Linden)
2013-03-18more urgent notification (DEBUG->WARN) for some texture fetch error casesBrad Payne (Vir Linden)
2013-03-18CHUI-826 FIX [CHUIBUG]User nametags (nametag floaters) intermittently ↵Cho
disappear in CHUI builds. Added check in LLVOAvatar::idleUpdateNameTagText() to account for case where mNameString is literally "" (two quotes)
2013-03-18cut back log spamBrad Payne (Vir Linden)
2013-03-18mergeGilbert Gonzales
2013-03-18mergeBrad Payne (Vir Linden)
2013-03-18mergeBrad Payne (Vir Linden)
2013-03-18BUILDFIX new appearance utility src for fixing a runtime errorNyx Linden
2013-03-18CHUI-861 FIXED "Animate" param is set false.Mnikolenko ProductEngine
2013-03-18CHUI-830 Icons uploadedMnikolenko ProductEngine
2013-03-18CHUI-620 FIXED Clear the highlight when auto-selecting new conversation or ↵Mnikolenko ProductEngine
when text is entered into the message panel.
2013-03-16CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on ↵merov
Linux
2013-03-15CHUI-852 ([crashhunters] crash in ↵Gilbert Gonzales
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-15Pull merge from lindenlab/viewer-chuiMerov Linden