summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2013-01-31Pull merge with lindenlab/viewer-chuiMerov Linden
2013-01-31CHUI-711 FIXED Load logs from file only once to avoid duplicating. This will ↵maxim@mnikolenko
also solve problem with chui-710.
2013-01-31CHUI-718 (User does not see own chat in conference IM)mberezhnoy
CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name appears, after ejecting any member from group)
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-31CHUI-612 FIXED Blank conversation names showing in conversation listmaksymsproductengine
2013-01-30mergingmberezhnoy
2013-01-30merging latest changesCho
2013-01-30CHUI-704 (Entry in 'Conversation Log' floater with your avatar's name ↵mberezhnoy
appears, after ejecting any member from group)
2013-01-29pull back more 3.4.5 beta fixesOz Linden
2013-01-30merging latest changesCho
2013-01-30CHUI-647 FIX "Conversations" floater is not opened when user wants to share ↵Cho
something via "Conversation log" floater Added call to show conversations floater in LLAvatarActions::share
2013-01-29Pull merge from lindenlab/viewer-chuiMerov Linden
2013-01-29CHUI-436 : Fixed : Do not skip yourself or group chat when checked Only ↵Merov Linden
friends and groups can call or IM me pref.
2013-01-29merge changes for MAINT-2276Oz Linden
2013-01-29CHUI-88 I shouldn't see Conference IMs from people I muted. Fix: In order to ↵Gilbert Gonzales
mute a user who initiated a conference/group chat, the session must be created on the server side and then left.
2013-01-29mergeGilbert Gonzales
2013-01-29CHUI-667: Attempting to correct Mac/Linux build issue.Gilbert Gonzales
2013-01-28CHUI-667: Post code review changesGilbert Gonzales
2013-01-29merging latest changesCho
2013-01-29merging latest changesCho
2013-01-29CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication ↵Cho
Console Immediately. Removed new code from on_new_message in LLIMView and instead, changed condition in LLFloaterIMSession::newIMCallback to update messages whenever the floater is visible
2013-01-28mergemberezhnoy
2013-01-28For MAINT-2276 a workaround to unblock 3.4.5 beta review: tedGraham Madarasz (Graham)
2013-01-28mergeGilbert Gonzales
2013-01-28CHUI-706 FIXED Appropriate function is now called in xmlmaxim@mnikolenko
2013-01-28CHUI-395 (Group moderators are not shown as Moderators in group conversation)mberezhnoy
2013-01-28CHUI-701 FIXED Don't show toasts and flashing, if conversation is opened but ↵maxim@mnikolenko
isn't focused.
2013-01-26[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate entry from panel_preferences_general.xml
2013-01-25CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. ↵Gilbert Gonzales
Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
2013-01-26undid accidental revert of someone else's fixCho
2013-01-26CHUI-644 FIX [CHUIBUG]Received IM's Don't Always Appear in Communication ↵Cho
Console Immediately. Added call to LLFloaterIMContainer::selectConversation() in on_new_message for LLIMView
2013-01-25[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate notification elements
2013-01-25merging latest changesCho
2013-01-25merging latest changesCho
2013-01-25CHUI-291 FIX New auto-replace feature does not work with chui text input ↵Cho
boxes in conversation floater Modified LLAutoReplace to pass back a string for replacement instead of modifying the input string
2013-01-25merge changes for MAINT-2275, MAINT-2277Oz Linden
2013-01-25merge changes for DRTVWR-290Oz Linden
2013-01-25CHUI-291 FIX New auto-replace feature does not work with chui text input ↵Cho
boxes in conversation floater Fixed autoreplace in LLTextEditor so it updates correctly and works with undo
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break tanks. Reverts MAINT-1742
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break doors. Reverst MAINT-2247
2013-01-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2013-01-24CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tabmaksymsproductengine
2013-01-28CHUI-708 FIXED Call doToParticipants() only if selected conversation is p2pmaxim@mnikolenko
2013-01-24MAINT-2277 Yellow "fence" (selection) of the parcel doesn't update after ↵Kelly Washington
selecting the other parcel * Removed bogus check on matching parcel data coming in.
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
2013-01-23merging latest changesCho
2013-01-23CHUI-291 FIX New auto-replace feature does not work with chui text input ↵Cho
boxes in conversation floater Moved autoreplace hooks from LLLineEditor to LLTextEditor, and modified LLAutoReplace accordingly
2013-01-23CHUI-695 Viewer crashes after attempt to accept a friendship in IM: remove ↵AlexanderP ProductEngine
an infinity loop of reshape()
2013-01-25CHUI-697 FIXED We don't need to update form for Inventory offer notificationmaxim@mnikolenko
2013-01-24merging into latest changesmberezhnoy
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 13:34:53 +0000