summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-10-22CHUI-433: Implemented an alternate solution to the problem. The original ↵Gilbert Gonzales
solution was ambiguous and incomplete and also preserved an existing hack. The new solution removes a hack/deprecated code (setActiveSession/getActiveSession functions). Basically, a toast message is not displayed if the user already has the conversation in focus. When the conversation floater loses focus toasts message will be displayed for that conversation.
2012-10-22merging in latest changesGilbert Gonzales
2012-10-19CHUI-433: Problem: Toasts were not being displayed due to incorrect tracking ↵Gilbert Gonzales
of the current conversation with focus. Resolution: Now when a conversation gains focus it will set a flag to ignore toasts. And when a conversation loses focus it will set a flag to re-enable toasts.
2012-10-19Pull merge from richard/viewer-chuiMerov Linden
2012-10-19CHUI-422 : Add invited non buddies to the initial set of speakersMerov Linden
2012-10-19CHUI-391: Replacing nearby chat icon.William Todd Stinson
2012-10-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-19CHUI-416 FIXED Check if conversationItem is not NULL before calling getType().maxim_productengine
2012-10-18Pull merge from richard/viewer-chuiMerov Linden
2012-10-18CHUI-373 : Fix : Refresh panel after setting parcel for saleMerov Linden
2012-10-18merging in latest changesGilbert Gonzales
2012-10-18CHUI-329: Post code review commit, instead of hard coded the parenthesis, ↵Gilbert Gonzales
created a custom string in string.xml. The reasoning for this is because some languages may not use the parenthesis or perhaps even use brackets if needed...basically allows for flexibility.
2012-10-18merge into latest changesMaximB ProductEngine
2012-10-18CHUI-329: The text is now gray due to CHUI 410. The only change in this ↵Gilbert Gonzales
commit is that parenthesis surround the nearby chat text (Nearby chat).
2012-10-18CHUI-431 : Merge of VITA changesMerov Linden
2012-10-18CHUI-412 (User restricted in resizing conversation floater width)MaximB ProductEngine
fixed
2012-10-17Pull merge from richard/viewer-chuiMerov Linden
2012-10-17CHUI-422 : One last clean upMerov Linden
2012-10-17CHUI-422 : Clean up of leftover traces and testsMerov Linden
2012-10-17CHUI-422 : Update the ad-hoc conversation with the known list of on line ↵Merov Linden
agents without waiting for server message (which often doesn't come...).
2012-10-17MAINT-1527 Fix for crash on exit when VBO disabledDave Parks
2012-10-17merging in latest changesGilbert Gonzales
2012-10-17merging in latest codeGilbert Gonzales
2012-10-17warn-on-failure:unix-eolGilbert Gonzales
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-17CHUI-410: Now when a converation floater is focused the default text 'To ↵Gilbert Gonzales
<Some User>' displays only when the text input field is empty.
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-18merging in latest changesMaximB ProductEngine
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-18CHUI-399 (When user has Pressing Letter Keys starts local chat setting on, ↵MaximB ProductEngine
first presses of letter keys do not open chat) fixed
2012-10-17MAINT-1551 : WIP : More tests to elicit a correct answer from the backbone ↵Merov Linden
server
2012-10-17CHUI-419 FIXED Selecting the drop down arrow to list participants for a ↵maksymsproductengine
conversation does not select that conversation
2012-10-17CHUI-394 FIXED Group moderation tools missing in right click menusmaksymsproductengine
2012-10-16merging in latest changesGilbert Gonzales
2012-10-16Move const kw locationJeff (Gioffredo Linden)
2012-10-16Make getValue const to fix Windows builds - and be more robustJeff (Gioffredo Linden)
2012-10-16CHUI-380: Realized that the when clicking the participant/conversation item ↵Gilbert Gonzales
that the active session wasn't being stored. This caused the right side conversation floater to not change when selecting a participant under a conersation. Resolution: now when clicking on a conversation or participant the active session is stored using setActiveSession().
2012-10-16CHUI-388 FIXED Do not add menu items to Participant Menu if own avatar is ↵maxim_productengine
selected in participant list. Do not show Menu if all menu items are disabled.
2012-10-15MAINT-1551 : WIP : Added a hack : send an accept invitation message so to ↵Merov Linden
trigger the sending of the agent list.
2012-10-15CHUI-380: Bug fix after merge. When selecting the participant of a ↵Gilbert Gonzales
conversation focus would be lost on the converstation floater. This was because focus would be set to the participant folder item. Resolution: Now delegate focus from the particiapnt folder item to the conversation floater.
2012-10-15MAINT-1551 : WIP : MergeMerov Linden
2012-10-15MAINT-1551 : WIP : More IM comm tracing and attempt to fixMerov Linden
2012-10-15CHUI-380: Merge fix, the addConverationListItem API was changedso that it ↵Gilbert Gonzales
does not by default select the new conversation item. Adjusted sessionAdded and sessionVoiceOrImStarted functions to specify that the first item should be selected when calling addConversationListItem().
2012-10-15MAINT-1551 : WIP : Trace IM messaging in and out.Merov Linden
2012-10-15MAINT-1721 Fix for crash when clicking "back" button after editing appearance.Dave Parks
Reviewed by VoidPointer
2012-10-15merging in latest changesGilbert Gonzales
2012-10-15CHUI-380: Final commit for this issue. After code review changed some method ↵Gilbert Gonzales
names to be more accurate. Also using dynamic_cast instead of static_cast for safety.
2012-10-15CHUI-400 FIXED Disable "Activate Group" menu item if selected group is the ↵maxim_productengine
active group
2012-10-12CHUI-380: (In progress) Refactoring needed to fix focusing issues when ↵Gilbert Gonzales
selecting an existing conversation item. This commit resolves re-introducing bug CHUI-289. Will code review and cleanup code in next commit.
2012-10-12Fix typoJeff (Gioffredo Linden)