summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-09CHUI-517: Altering the behavior and copy of the main menu status choices. ↵William Todd Stinson
Busy has been replaced with Do Not Disturb. And both status options have been switched to be indicated with a check rather than alternating text.
2012-11-09pull back 3.4.2-beta3 fixesOz Linden
2012-11-09Added tag 3.4.2-beta3 for changeset 710785535362Oz Linden
2012-11-09MAINT-1311 Thread safe handling of retries on mesh loading failures.Dave Parks
2012-11-09Additional fix for CHUI-473maxim_productengine
2012-11-09CHUI-362 WIP (Torn off conversation name is highlighted when selected in ↵AlexanderP ProductEngine
conversation list with different conversation showing in message panel): implemented the stub panel and a control of it's visibility
2012-11-09tag merge of DRTVWR-242Oz Linden
2012-11-09CHUI-362 WIP (Torn off conversation name is highlighted when selected in ↵AlexanderP ProductEngine
conversation list with different conversation showing in message panel): implemented method for a switch off tabs (switching to an invisible state)
2012-11-12CHUI-386 FIXED Vertical scrollbar not fully showing in conversation message ↵maksymsproductengine
panel
2012-11-09CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and ↵AlexanderP ProductEngine
in accordance with the naming convention in the project, some classes and corresponding files should be renamed: LLIMConversation -> LLFloaterIMSessionTab LLIMFloater -> LLFloaterIMSession LLNearbyChat -> LLFloaterIMNearbyChat LLIMFloaterContainer -> LLFloaterIMContainer LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-08MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to ↵William Todd Stinson
fix these issues, but then was accidentally re-introduced during a bad merge.
2012-11-08Pull merge from richard/viewer-chui.Merov Linden
2012-11-08CHUI-464, CHUI-466, CHUI-474 : Fixed! Better, unified and more consistent ↵Merov Linden
use of refreshConversation() to update torn off dialogs.
2012-11-08CHUI-516: Correcting crash when receiving a god-like teleport lure request ↵William Todd Stinson
while in do-not-disturb mode.
2012-11-08Pull merge from viewer-chuiMerov Linden
2012-11-08Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-11-08CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now ↵William Todd Stinson
refers to it as Do Not Disturb mode.
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-lionDave Parks
2012-11-08merging into latest changesMaximB ProductEngine
2012-11-08MAINT-1311 Followup on logging and assertions of mesh loading errorsDave Parks
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-08merge changes for DRTVWR-240Oz Linden
2012-11-08tag merge of DRTVWR-240Oz Linden
2012-11-08merge up to viewer-developmentOz Linden
2012-11-08CHUI-387 FIXED (Conversation toasts not shown for open conversations when ↵AlexanderP ProductEngine
conversation floater is in a minimized state or undocked conversation is minimized): added checking of the minimized state
2012-11-08Trivial commit to force TeamCity to generate a new codeticket numberNat Goodspeed
2012-11-08Trivial commit to force TeamCity to generate a new codeticket numberNat Goodspeed
2012-11-07Removing unused code.William Todd Stinson
2012-11-07Pull from viewer-chui, had to resolve conflicts on llimfloatercontainer.cppMerov Linden
2012-11-07CHUI-468 : Fixed. Final clean up of LLParticipantList, including dependencies.Merov Linden
2012-11-07CHUI-484: Ensuring that the busy/do-no-disturb message is sent when the user ↵William Todd Stinson
is in the busy/do-not-disturb mode.
2012-11-07CHUI-468 : WIP : Clean up LLAvatarList and all sorting code left over in ↵Merov Linden
LLParticipantList
2012-11-07INTL-46 massive Chinese translation update for set28--set34, including new fileseli
2012-11-07sync with viewer-development (for 1 DE file)eli
2012-11-07Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-07CHUI-514: Updating to Leo's latest icon batch.William Todd Stinson
2012-11-07MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. ↵Dave Parks
Disable private memory pools. Make viewer large address aware on windows. Reviewed by Kelly
2012-11-07Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x.
2012-11-07merge changes for 3.4.2-beta2Oz Linden
2012-11-07CHUI-473, CHUI-482 FIXED (Clicking on nearby chat toast to open Conversation ↵AlexanderP ProductEngine
floater does not show Nearby Chat conversation selected in list; Nearby chat conversation is not selected in list by default when it is the only conversation ): implement. new logic in LLIMFloaterContainer for the syncronous select the conv. list's item and corresponding convers. floater; removed floater selecting from conv. items; fixed bug with item select
2012-11-07Added tag 3.4.2-beta2 for changeset e664473c16dfOz Linden
2012-11-07tag merge of DRTVWR-216Oz Linden
2012-11-07CHUI-450 (Your own name does not appear in nearby chat participant list if ↵MaximB ProductEngine
voice chat disabled) Added audio module initialization without faking mVoiceEnabled value
2012-11-06CHUI-468 : WIP : More cleanup and fix of the participants sorting in ↵Merov Linden
LLIMConversation
2012-11-06Simple change to force a new codeticket number.William Todd Stinson
2012-11-06Simple change to force a new codeticket number.William Todd Stinson
2012-11-06Altering the line item phone icon.William Todd Stinson
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06CHUI-462 (Torn-off Nearby Chat can't be closed)MaximB ProductEngine