summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-21mergeMaximB ProductEngine
2012-11-21CHUI-523 Additional fixmaxim_productengine
2012-11-21CHUI-533 FIXED Check that mConversationsRoot is not nullmaxim_productengine
2012-11-21CHUI-535 (Starting a conversation with a user that you have an existing ↵MaximB ProductEngine
conversation with can cause the conversation list and message panel to be out of synch) fixed
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-21CHUI-531 FIXED Poor fps in CHUI viewermaksymsproductengine
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-20MAINT-1270 Fix for flexi prims showing up as discs when first loading.Dave Parks
Reviewed by Stinson.
2012-11-20MAINT-1270 Fix for flexi prims showing up as discs when first loading.Dave Parks
Reviewed by Stinson.
2012-11-20merge changes for DRTVWR-247Oz Linden
2012-11-20tag merge of DRTVWR-247Oz Linden
2012-11-20Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-20CHUI-528, CHUI-536, CHUI-538, CHUI-540 Built single processor of different ↵AlexanderP ProductEngine
types of notifications
2012-11-20CHUI-522 FIXED Implement check box item 'Keep a conversation log and transcript'maksymsproductengine
2012-11-20CHUI-490 FIXED Small ui changes. Changed sound that is playing when floater ↵maxim_productengine
is opened. Call startIM() when user clicks on "Open IM instead" button.
2012-11-20CHUI-523 FIXED Set visibility of warning message depending on combobox state.maxim_productengine
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-20tag merge of DRTVWR-246Oz Linden
2012-11-20merge changes for DRTVWR-229Oz Linden
2012-11-20tag merge of DRTVWR-229Oz Linden
2012-11-20CHUI-447 Additional fix(Show only display name for user that starts ↵maxim_productengine
conversation )
2012-11-20CHUI-539 FIXED Chat FUI button flashes indefinitely if Icons Only setting is ↵maksymsproductengine
selected for the button display
2012-11-20CHUI-487, CHUI-488 Commented out demoAlexanderP ProductEngine
2012-11-19CHUI-470 : Fixed : Enable contextual menu in torn off conversationsMerov Linden
2012-11-19MAINT-1841 Fix for mac/linux buildDave Parks
2012-11-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-19Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-11-19MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max ↵Dave Parks
performance Reviewed by Simon.
2012-11-19Removed a few unnecessary include lines.Logan Dethrow
2012-11-19Restored part of indra/cmake/Variables.cmake that somehow got removed.Logan Dethrow
2012-11-19Moved implementation of incrementCofVersion to llappearancemgr.cpp. Changed ↵Logan Dethrow
retry logic to use the more robust mRetryPolicy instead of my own previous implementation.
2012-11-19Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-19increment version to 3.4.4Oz Linden
2012-11-19merge tag for 3.4.2-releaseOz Linden
2012-11-19Added tag 3.4.2-release for changeset 16310aabccf3Oz Linden
2012-11-19Added tag 3.4.3-beta1 for changeset 94ab2b49458aOz Linden
2012-11-19Merge.Logan Dethrow
2012-11-19WIP SH-3339 Only try to increment the cof version if in a server bake region.Logan Dethrow
2012-11-19Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-19mergeBrad Payne (Vir Linden)
2012-11-19Implementation for SH-3530, CR:Nyxprep@lindenlab.com
2012-11-19CHUI-362 ADD. FIX (When the "Bring back" panel is there, it is not possible ↵AlexanderP ProductEngine
to collapse the right side of the conversation dialog: the toolbar is completely missing and the "<<" chevrons are not there): This was because the button "<<" belonged session's floater and not the container. Therefore, when all the floaters in the stack becomes invisible, their buttons also become invisible. Solution: Added additional button "<<" in the stub_panel of the container.
2012-11-20mergeMaximB ProductEngine
2012-11-19CHUI-495: Ensuring that a user in do-not-disturb mode can receive voice ↵William Todd Stinson
calls from current conversations.
2012-11-19merge changes for DRTVWR-245Oz Linden
2012-11-19tag merge of DRTVWR-245Oz Linden
2012-11-19Added tag DRTVWR-232 for changeset f1d3b3fcab28Oz Linden
2012-11-19CHUI-488 ADD. fIX Clean up codeAlexanderP ProductEngine
2012-11-19CHUI-487 ADD. FIX (Revised comments)AlexanderP ProductEngine
2012-11-19CHUI-434 (Don't display phone icon and disable phone button when voice isn't ↵MaximB ProductEngine
enabled)