summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-04-02pulling in sunshine-stable to sunshine-internal.Nyx Linden
2013-04-02Renamed logCapabilites static function to log_capabilities in ↵Logan Dethrow
llviewerregion.cpp to better match coding standard.
2013-04-02SH-4051 FIX problem with teen account and undershirt layersNyx Linden
Updated logic for teen accounts, to ensure that during any transition that they are wearing at least one undershirt wearable and one underpants wearable.
2013-04-02SH-4044 FIX voice dot is offset vertically if using avatar height offsetNyx Linden
Added the height offset in one too many places. fixing.
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-29mergeNyx Linden
2013-03-29SUN-57 SH-4039 FIX bake fail on non-ssb regionsNyx Linden
We were getting the texture ID from the type,index couple, but were not passing in index, which defaulted to 0. texture ID is available from the texture object itself, so using that and removing the index parameter to prevent future confusion.
2013-03-29Another Chui beta6+ merge to deal with build issuesprep@lindenlab.com
2013-03-29Additional fix for CHUI-903Mnikolenko ProductEngine
2013-03-29Merged in Chui beta6+ fixesprep@lindenlab.com
2013-03-29CHUI-903 FIXED Don't show toasts if Session floater is torn-off and in focus.Mnikolenko ProductEngine
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-28CHUI-799 FIXED Notification is not given to user when they select only ↵AlexanderP ProductEngine
friends and groups can IM me preference
2013-03-28sh-4014: Don't send appearance updates while editing.prep
2013-03-28CHUI-896 FIXED Line flashing and FUI button flashing not working correctly ↵AlexanderP ProductEngine
for CHUI notifications: added flashing of the line item after conv. floater opens
2013-03-28CHUI-905 (Viewer crashes while using Insert keyboard key in chat): Problem ↵Gilbert Gonzales
was because when insert was used at the end of a string of text, this would attempt to delete something past the bounds of the string...as a side effect the size of the segment was increasing even though the string length never changed. The segment size would be greater than the string size and would eventually cause an invalid read outside the bounds of the string.
2013-03-28CHUI-855 FIXED Text entry bar auto expand does not resizemaksymsproductengine
2013-03-27CHUI-486 ADD FIX Update Preferences -> Chat XUIAlexanderP ProductEngine
1) when preference is "Pop up" - added toast according to Kurt's comment from 22/Dec/12; 2) fixed line item flashing and "Chat" button flashing in other cases according to original matrix.
2013-03-27mergeGilbert Gonzales
2013-03-27CHUI-875 (Viewer experiences a 10s delay on dnd (do not disturb) ↵Gilbert Gonzales
notification loading): For now adding logging when reading from persistent notifications and from dnd notifications.
2013-03-27Pull merge from lindenlab/viewer-chuiMerov Linden
2013-03-27CHUI-901 : Fixed! Do touch torn off state in restoreFloater()Merov Linden
2013-03-27mergeGilbert Gonzales
2013-03-27CHUI-851 ([CHUIBUG]Focussing issue and unresponsive tabs when focus is ↵Gilbert Gonzales
brought back to the HUB): Now when pressing enter a docked nearby chat floater will be focused and the conversation line item will be selected. When the nearby chat is not docked then only the floater will be focused.
2013-03-27mergemberezhnoy
2013-03-27CHUI-894 FIXED Call closeAll() for LLIMWellWindow to clear object notifications.Mnikolenko ProductEngine
2013-03-27mergeGilbert Gonzales
2013-03-27CHUI-893 ([CHUIBUG]Chat input field scrambles "/nod")mberezhnoy
2013-03-27pulling in sunshine-stableNyx Linden
2013-03-27CHUI-895 FIXED Show toasts for messages if conversation is collapsed to ↵Mnikolenko ProductEngine
Input bar(regardless of other prefs).
2013-03-26CHUI-862 FIXED Save collapsed state for nearby chat.Mnikolenko ProductEngine
2013-03-26CHUI-846 ([crashhunters] crash in LLFontGL::maxDrawableChars): Added logging ↵Gilbert Gonzales
for bug to further track down problem when it occurs. Need to debug further based off information.
2013-03-25Pull merge from lindenlab/viewer-chuiMerov Linden
2013-03-25CHUI-892 : Fixed. restoreFloater() called when floater dockedMerov 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-25mergemberezhnoy
2013-03-25CHUI-885 (View Profile,Send IM and Add friend are not functional in context ↵mberezhnoy
menu for allowed or banned users of the parcel.)
2013-03-23CHUI-888 : Fixed! Overload setVisibleAndFrontmost() so that we set the focus ↵Merov Linden
if requested (was dropped in the shuffle before).
2013-03-22CHUI-889 : Fixed! Collapse/Expand of participants list in torn off panelsMerov Linden
2013-03-22CHUI-877 : Fixed! Ignore the Vivox buffy names right now and avoid ↵Merov Linden
invalidation avatar name cache when seeing a difference with vivox
2013-03-22Pull from lindenlab/viewer-chuiMerov Linden
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-22CHUI-854 FIXED Don't expand chat in collapsed mode.Mnikolenko ProductEngine
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-22CHUI-486 FIXED Update Preferences -> Chat XUI: implemented new bthavior; ↵AlexanderP ProductEngine
deleted spaghetti code