summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-03-06MergeGilbert Gonzales
2013-03-06CHUI-821 Clean up codeAlexanderP ProductEngine
2013-03-06CHUI-821 Clean up codeAlexanderP ProductEngine
2013-03-05merge changes for 3.5.0-beta2Oz Linden
2013-03-05merge changes for child prim movementOz Linden
2013-03-05For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934.Graham Madarasz (Graham)
2013-03-05CHUI-829 (Allow Conversations floater to display a different chat than the ↵Gilbert Gonzales
torn off and selected window): Now when selecting a torn off conversation this will not select the conversation line item.
2013-03-05CHUI-778: Adjusted deletion of transcripts/logs to be more clean code-wise.Gilbert Gonzales
2013-03-05Pull from viewer-beta (version number update and tag)Merov Linden
2013-03-05mergingCho
2013-03-05CHUI-764 (Group Profile is not opened after selecting 'Show group ↵mberezhnoy
information' in context menu of 'About Land' dialog)
2013-03-05CHUI-809 FIXED "Start IM" menu item is addedMnikolenko ProductEngine
2013-03-05CHUI-815 FIXED Handle SHIFT+ENTER to whisper in Nearby chatMnikolenko ProductEngine
2013-03-04CHUI-778: Now when delete transcripts is pressed the backup files will be ↵Gilbert Gonzales
deleted as well. Also if clear logs is pressed then backup logs will be cleared.
2013-03-05CHUI-772 FIX User sees no notification of conversation activity not visible ↵Cho
in long scrolling conversation list Added call to setSelectedSession() from LLConversationViewParticipant::handleMouseDown()
2013-03-05mergemberezhnoy
2013-03-04For MAINT-2423 fix regression from CHUI merge. Code review: DavePGraham Madarasz (Graham)
2013-03-04merge changes for grouping materials requestsOz Linden
2013-03-04fix Linux warning/errorOz Linden
2013-03-04mergeGilbert Gonzales
2013-03-04CHUI-778: Now when changing paths for chat logs and transcripts any empty ↵Gilbert Gonzales
conversations will be reloaded with data from the new location. Use case for this is if the users nearby chat is empty and they switch to a location that has a nearby chat file, then the nearby chat file be loaded.
2013-03-04CHUI-757 FIXED CHUI viewer shows Autopilot cancelled notification toast when ↵maksymsproductengine
interrupting click to walk: - The AutopilotCanceled notification was disabled for this viewer;
2013-03-04CHUI-822 FIXED Resizing conversation floater with conversation list ↵AlexanderP ProductEngine
minimized to icons sets to fixed width that cannot be reduced : set resize limits to conv.panel's minDim() when conv. panel is collapsed
2013-03-04CHUI-821 FIXED Conversation size regression when logging out with ↵AlexanderP ProductEngine
conversation list minimized to icons : save current conv. panel's width
2013-03-04CHUI-806 (IM floater is not become as a top while geting message with ↵mberezhnoy
enabled 'Open conversation window' option)
2013-03-01CHUI-807 : Fixed (attempt) : Defensive coding to prevent potential crashMerov Linden
2013-03-01protect against missing mNormalMap or mSpecularMapOz Linden
2013-03-01merge fix for unit test problem with some python configurationsOz Linden
2013-03-01remove use of system llbase module in integration tests; always use the one ↵Oz Linden
from this tree
2013-02-28Group multiple material PUT requests together and throttle requests to the ↵Kitty Barnett
region
2013-02-28Mark a material as 'pending' from the very first call to LLMaterialMgr::get()Kitty Barnett
2013-02-28CHUI-795 FIXED 'Chat history' is enabled but not functional in context menu ↵maksymsproductengine
for friend in Conversation pane while all logs cleared.
2013-03-01CHUI-794 FIXED Disable context menu options if you select yourself with ↵Mnikolenko ProductEngine
other participants
2013-03-01CHUI-694 FIXED Handle ALT + Up/Down and ALT + Right/Left to switch ↵Mnikolenko ProductEngine
conversations in the list. Handle ALT + Enter to expand participant list of selected conversation.
2013-03-01mergingmberezhnoy
2013-02-28Clear face's material ID internally when removing the material.Tonya Souther
2013-02-28CHUI-789 (Letter m appears in Conversations while exit from outlook view ↵mberezhnoy
using 'M' keyboard key)
2013-02-27Wire up LLMaterialMgr::remove() to edit panel.Tonya Souther
2013-02-27CHUI-788 FIXED Mute icon not shown in participant list in conversation floatermaksymsproductengine
2013-02-25CHUI-778: Now when conversation log and trascript files are moved they will ↵Gilbert Gonzales
not overwrite prior files with the same name. Instead the prior files will be stored as *.backup.
2013-02-25increment version to 3.5.1Oz Linden
2013-02-25increment minor version: 3.5.0Oz Linden
2013-02-25mergeGilbert Gonzales
2013-02-25mergeGilbert Gonzales
2013-02-25mergeGilbert Gonzales
2013-02-25CHUI-778: Pushing a quick fix that only pertains to CHUI-778 so we can close ↵Gilbert Gonzales
out this issue.
2013-02-25Fixed GCC compiler error in previous changesetKitty Barnett
2013-02-25mergingCho
2013-02-25mergeGilbert Gonzales
2013-02-25Added "Selected Material Info" menu option to query basic material ↵Kitty Barnett
information about the current selection