summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-12-04merging in latest changesGilbert Gonzales
2012-12-04CHUI-571: Fixed bug where when the converation floater was torn off and a ↵Gilbert Gonzales
new im received, the incorrect conversation would be displayed and focused. In order to do this removed the conversation floater panels from being focused immediately when set visible. Also there was a bug when showing the stub panel for torn off conversations. The tab container was not setting the stub panel index properly to 0, which is where the stub panel existed in the tab container's list. This is post code review submit. Will submit another with minor code review changes.
2012-12-04merge changes for DRTVWR-253Nat Goodspeed
2012-12-04tag merge of DRTVWR-253Nat Goodspeed
2012-12-04merge changes for BUG-768Nat Goodspeed
2012-12-04Fix merge breakagesimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-12-04Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-12-04Updating the comparison function to not use ascii-character comparison. ↵William Todd Stinson
This will give better sorting when the operator overriden comparators are used.
2012-12-04Pull merge from richard/viewer-chuiMerov Linden
2012-12-04Implementing string conversion and comparison operator overrides for the ↵William Todd Stinson
LLMaterialID class.
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull merge from richard/viewer-chuiMerov Linden
2012-12-04CHUI-550, CHUI-551 : Fixed : Changed conversation sorting according to ↵Merov Linden
designer's desires.
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-04MAINT-1953 Run through viewer stats and update GPU table with missing ↵Dave Parks
entries and new expected OpenGL versions
2012-12-04merge changes for DRTVWR-251Nat Goodspeed
2012-12-04tag merge of DRTVWR-251Nat Goodspeed
2012-12-04merge changes for MAINT-1953Nat Goodspeed
2012-12-04Pull back upstream fixes from viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04CHUI-504 FIXED Open Conversation floater on first login.AlexanderP ProductEngine
added toggleInstanceOrBringToFront("im_container") to LLStartup; typo corr.
2012-12-05CHUI-572 FIXED Changed initial position for floaters according to description.maxim@mnikolenko
2012-12-04tag merge of DRTVWR-255Nat Goodspeed
2012-12-04tag merge of DRTVWR-252Nat Goodspeed
2012-12-04Mergingmaxim@mnikolenko
2012-12-04CHUI-530 FIXED Using selectConversationPair will show appropriate session ↵maxim@mnikolenko
floater.
2012-12-04mergingMaximB ProductEngine
2012-12-04CHUI-527 FIXED Changed term to "Multi-person chat"maxim@mnikolenko
2012-12-03more for MAINT-1955: Viewer crashes while login after clearing cacheXiaohong Bao
2012-12-03more for MAINT-1955: Viewer crashes while login after clearing cacheXiaohong Bao
2012-12-03Cleaning up some unreferenced member variables and related types from ↵William Todd Stinson
LLNotifications.
2012-12-04CHUI-573 FIXED Notification chiclet shown when object chiclets are shownmaksymsproductengine
2012-12-03merging in latest changesGilbert Gonzales
2012-12-03MAINT-1979 Viewer crashes while attempting to join group in the moment of ↵Kelly Washington
loading group members * Fix one race condition that could dereference a dangling pointer. reviewed with Simon and Baker.
2012-12-03CHUI-571: Now when the 'Chat Preference' is set to 'Open Conversations ↵Gilbert Gonzales
window' the conversation line item with flash. The only time it does not flash is when the the conversation line item is already focused. Also fixed various focusing bugs when navigating between conversations and participants.
2012-12-03MAINT-1748 Users have an ability to sell non existing objects from content ↵Kelly Washington
of other object * Keep the buy-contents floater subscribed to inventory changes on the object. reviewed with Simon
2012-12-03CHUI-532 FIXED (Viewer crash when user in conversation is removed from ↵AlexanderP ProductEngine
participant list because they logged out or teleported away) delayed destroy of the timer
2012-12-03Handle delayed requesting and sending of materials through an idle callbackKitty Barnett
2012-12-03CHUI-556 (Tooltip on call button incorrect when call is active)MaximB ProductEngine
2012-12-03Added LLMaterialMgr::get() to retrieve individual materials (with optional ↵Kitty Barnett
callback)
2012-12-03CHUI-432 (User that is muted in group call does not show as muted to other ↵MaximB ProductEngine
users in conversation list)
2012-12-03Started LLMaterialMgr to handle viewer<->region materials communicationKitty Barnett
* refactored LLFloaterDebugMaterials::requestPutMaterials() to use LLMaterialMgr instead * replaced "Object editing" results list with information about the active selection instead
2012-12-02Refactor LLFloaterDebugMaterials::convertToPrintableMaterialID() as ↵Kitty Barnett
LLMaterialID::asString() so it can be used everywhere
2012-12-02Fixed two minor issues (mDiffuseAlphaMode and mAlphaMaskCutoff were ↵Kitty Barnett
reversed; specular rotation had wrong format specifier)
2012-12-02Changed line editors to spin controls for all material float parameters in ↵Kitty Barnett
the debug floater
2012-12-02Pull and merge from https://bitbucket.org/lindenlab/viewer-developmentKitty Barnett
2012-11-30CHUI-406 : Fixed again : Update of the P2P session name when not initiating ↵Merov Linden
a session was wrong. Add getting the participant name from the session.
2012-11-30MAINT-1958 Trivial change to kick teamcity into behaving.Dave Parks
2012-11-30Pull merge from richard/viewer-chuiMerov Linden
2012-11-30CHUI-404, CHUI-406 : Fixed : update ad-hoc conversation when participant ↵Merov Linden
logs off, update title of ad-hoc and P2P to be consistent with torn off and input field