summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-04-02mergeBrad Payne (Vir Linden)
2013-04-02SH-4057 FIX - cleaned up old canUseHTTP logic, now lives in llviewertexture.cppBrad Payne (Vir Linden)
2013-04-02mergeNyx Linden
2013-04-02BUILDFIX commit policy fixesNyx Linden
2013-04-02mergeprep@lindenlab.com
2013-04-02Merged in chui beta code.prep@lindenlab.com
2013-04-02Removed setCanUseHTTP override in llvoavatarBrad Payne (Vir Linden)
2013-04-02mergeBrad Payne (Vir Linden)
2013-04-02SH-4057 FIX - host bake textures should start with UDP fetching now, instead ↵Brad Payne (Vir Linden)
of waiting to fail down
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-02change initLogging virtual functions to void (returns were ignored anyway)Oz Linden
2013-04-02Add reporting of last_exec_durationOz Linden
(and clean up logic around multiple instances)
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-02CHUI-811 FIXED [CHUIBUG]Too much spacing around the new chat UI elementsAlexanderP ProductEngine
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-01CHUI-896 : ADD FIX : Line flashing and FUI button flashing not working ↵AlexanderP ProductEngine
correctly for CHUI notifications backed out 902caf2 and (partly) d498514; case "NOT_ON_TOP" was fixed
2013-04-01mergeGilbert Gonzales
2013-04-01CHUI-796 (User doesn't get all messages in 'do not disturb' mode): Now when ↵Gilbert Gonzales
a conversation is focused by clicking on it's line item, selecting a torn off floater or unminimized a torn off floater the stored notifications for that conversation will be removed.
2013-04-01CHUI-907 : Fixed! Suppress inexistant menu item and duplicated registrar ↵Merov Linden
entry to avoid warning
2013-04-01CHUI-907 : Prevent warning when parsing menus adding name to menu_item_checkMerov Linden
2013-04-01CHUI-904 FIXED Set the focus on the Nearby chat floater after setting ↵Mnikolenko ProductEngine
visibility.
2013-04-01mergemberezhnoy
2013-04-01Backed out accidentally committed change to logcontrol.xml.Logan Dethrow
2013-04-01merge changes for 3.5.0-beta7Oz Linden
2013-04-01CHUI-886 (Time in front of the name is not displayed when the Conversations ↵mberezhnoy
size is reduced to a minimum.)
2013-03-29CHUI-807 : Trace add and remove sessionsMerov Linden
2013-03-29CHUI-807 : Add more defensive coding. Also trace in log the sessions created ↵Merov Linden
so we'll have a better idea of what people do with conversations if we see that crash again.
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-29Fix unused return val from fwrite causing warnings causing errorsGraham Madarasz
2013-03-29Viewer breakpad linux fixesGraham Madarasz
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28Google Breakpad FixGraham Madarasz (Graham Linden)
2013-03-28Merged lindenlab/viewer-development into defaultgraham linden
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-28merge changes for 3.5.0-beta6Oz Linden
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 03:25:42 +0000