summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-29Pull merge from richard/viewer-chuiMerov Linden
2012-10-29CHUI-469 : Fixed. Add the widget to its map, init the widget map ↵Merov Linden
consistently and correctly.
2012-10-29MAINT-1791 : Parcel media clear list crash. Reviewed by Kellysimon@Simon-PC.lindenlab.com
2012-10-26CHUI-469 : WIP : Add participants to the nearby chat torn off panelMerov Linden
2012-10-26CHUI-465 : Add event handling for LLIMConversation participant listMerov Linden
2012-10-26CHUI-383: Realized that prior changes for this bug caused a regress. The ↵Gilbert Gonzales
regress was using the people panel or a notecard to start a im/call with a user. When doing this the conversation line item would not be focused. Resolution: Changed all calls to LLIMFloater::show() to LLIMFloaterContainer::showConversation(), which will first select the conversation line item and then show the corresponding conversation floater.
2012-10-26MAINT-1709 Fix for >> that should have been > >Dave Parks
2012-10-26merging in latest changesGilbert Gonzales
2012-10-26CHUI-383: Now a new conversation will not take focus. Instead a toast will ↵Gilbert Gonzales
appear. Problem: Each time a conversation was added, code would execute to add the conversation floater AND select the conversation. Resolution: This is no longer the expected behavior so adjusted LLIMFloater::addToHost() to only add a floater and not select/show the floater. If selection and/or showing is needed it seems to make sense that this is done outside LLIMFloater:addToHost().
2012-10-26merging into latest changesMaximB ProductEngine
2012-10-26CHUI-439 (Conversation floater is automatically unminimized when a selected ↵MaximB ProductEngine
user is removed from nearby chat participant list after teleport) CHUI-438 (Conversation remains transparent after teleport with a participant selected in nearby chat)
2012-10-26Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-10-26MAINT-1311 Add some logging and assertions to help track down mesh loading ↵Dave Parks
errors.
2012-10-26CHUI-457 FIXED Check that selected participant is not self before performing ↵maxim_productengine
actions.
2012-10-25CHUI-441 : WIP : Fix crashes when spawning torn off floaters, added widgets ↵Merov Linden
creation in the torn off floater for participants.
2012-10-25MergeKelly Washington
2012-10-25CHUI-449: Post code review with Merov, adjusted setConvItemSelect() fuction ↵Gilbert Gonzales
to be called selectConversation().
2012-10-25CHUI-449: Got rid of a function called setItemSelect(), I wrote this code ↵Gilbert Gonzales
and it doesn't have a purpose anymore since I can use setConvItemSelect() instead. Also now torn off, minimized conversations are selected when clicking a toast for that conversation. Resolution: Adjusted setConvItemSelect() to be less strict when trying to select an item, now as long as the function is called it will attempt to select the conversation line item.
2012-10-25MAINT-1275 [SECURITY] Web session tokens saved in SecondLife.logKelly Washington
reviewed with Simon
2012-10-25MAINT-1743 "Use Selection for Grid" does not change the grid ruler to ↵Kelly Washington
"Reference" in the tools floater Reviewed with Simon.
2012-10-24CHUI-441 : WIP : Fix the initial attach code so to allow creation of the ↵Merov Linden
conversation item before the dialog
2012-10-24CHUI-441 : WIP : More map clean up and better use of get_ptr_in_map()Merov Linden
2012-10-24CHUI-441 : WIP : Fixed the creation of empty model records in the list modelMerov Linden
2012-10-24CHUI-449: Problem: When a toast was clicked, the conversation floater was ↵Gilbert Gonzales
displayed without selecting the conversation line item. Resolution: Added a function that will show the conversation floater container and then trigger selecting the conversation line item. When the conversation line item is selecting this implicitly will cause the correct conversation floater to be displayed.
2012-10-24pull back changes (enable tcmalloc) from 3.4.1-beta10Oz Linden
2012-10-24CHUI-441 : WIP : Initial refactor part 2. Works but the list doesn't update ↵Merov Linden
in the torn off dialog.
2012-10-24Added tag 3.4.1-beta10 for changeset 4e0d84e92132Oz Linden
2012-10-24CHUI-363: Problem: Nearby chat is a set to be a null converstation. Because ↵Gilbert Gonzales
of this, when the voice indicator was set to only show for active conversations...voice indicators inside null conversations were not being turned toggled. Resolution: Now will adjust the speaker indicator even if it exists in a null (nearby chat) conversation.
2012-10-24disable tcmalloc againOz Linden
2012-10-24CHUI-430 FIXED Open Nearby chat if is is the only conversation in the list.maxim_productengine
2012-10-23MAINT-1579 Fix for diffuse color being ignored in mesh import preview render.Dave Parks
2012-10-23Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-23Allow user to override either English, or localized, skinned file.Nat Goodspeed
Original LLDir::findSkinnedFilenames() implementation used a tricky rule: a given skin directory was only considered if it provided a default-language override for the sought filename, regardless of whether it also provided localizations for that filename. Discussion with Richard clarifies that we want to allow the user to override neither, either or both. Change findSkinnedFilenames() accordingly; update unit tests to verify new semantics.
2012-10-23MAINT-1567 cleanup some gcc warningsDave Parks
2012-10-23Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-10-23MAINT-1567 Fix for incorrect triangle and hull counts in mesh importer.Dave Parks
Reviewed by VoidPointer
2012-10-23Backed out changeset: 174fccc7016dWilliam Todd Stinson
2012-10-23CHUI-418 FIXED Check that mViewModelItem is not NULLmaxim_productengine
2012-10-22CHUI-441 : WIP : Initial changes to LLIMFloater to use the same model as ↵Merov Linden
LLIMFloaterContainer
2012-10-22Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-22merging in latest changesGilbert Gonzales
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-22whitespace change to force new build in TCcallum_linden
2012-10-22Backed out changeset: 4202e227f8e4William Todd Stinson
2012-10-22LLDrawable::destroy: Illegal deletion of LLDrawable!Nicky
2012-10-23correct faulty mergeOz Linden
2012-10-22Enable tcmallocDave Parks
2012-10-22Trying original version of GBP with new scripts/code- revert corresponding ↵callum_linden
cpp code
2012-10-22Trying original version of GBP with new scripts/codecallum_linden
2012-10-22merging in latest changesGilbert Gonzales