summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-08merging into latest changesMaximB ProductEngine
2012-11-08merge changes for DRTVWR-240Oz Linden
2012-11-08tag merge of DRTVWR-240Oz 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-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-07CHUI-514: Updating to Leo's latest icon batch.William Todd Stinson
2012-11-07Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
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-06Altering the line item phone icon.William Todd Stinson
2012-11-06CHUI-462 (Torn-off Nearby Chat can't be closed)MaximB ProductEngine
2012-11-06Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-06CHUI-448 FIXED p2p IM chat conversations show a participant list with a caratmaksymsproductengine
2012-11-07Fixed postBuild() for Ad-hoc conferenceAlexanderP ProductEngine
2012-11-06merging in latest changesGilbert Gonzales
2012-11-06CHUI-507: Updated to the new layout of 'Chat Preferences' according to CHUI ↵Gilbert Gonzales
Notifications spec. The functionality for the new preferences is not yet implemented.
2012-11-06merge changes for DRTVWR-223Oz Linden
2012-11-06tag merge of DRTVWR-223Oz Linden
2012-11-06merge changes for DRTVWR-208Oz Linden
2012-11-06tag merge of DRTVWR-208Oz Linden
2012-11-05Pull merge fom viewer-chui-441Merov Linden
2012-11-05CHUI-468 : WIP : Taking LLAvatarList and related out of LLParticipantListMerov Linden
2012-11-05CHUI-479: Problem: The parent folder's view model did not store the session ↵Gilbert Gonzales
id. Because of this, the speaker indicator would be set to a session id of null (nearby chat). Solution: Now when the folder view model is created in the torn off list, pass in the session id. This allows the folder view model to know which session id it belongs to. Participants can then look at the parent folder (folder view) and retrieve the session id.
2012-11-05CHUI-468 : Suppress LLCallFloater completelyMerov Linden
2012-11-05pull back DRTVWR-217 and tag for 3.4.2-beta1Oz Linden
2012-11-05Added tag 3.4.2-beta1 for changeset 704bbae7b182Oz Linden
2012-11-05CHUI-468 : Suppress LLIMFloater::onParticipantsListChanged(). Not useful ↵Merov Linden
anymore.
2012-11-05merge changes for DRTVWR-217Oz Linden
2012-11-05tag merge of DRTVWR-217Oz Linden
2012-11-05increment version to 3.4.3Oz Linden
2012-11-05pull back release tagOz Linden
2012-11-05Added tag 3.4.1-release for changeset e59ffd3fe083Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 14:45:48 +0000