summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-15changed ctor param to use in-process crash generationcallum_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-15pull back 3.4.1-beta7 fixesOz Linden
2012-10-15Add 'sourceid' settings var specifically for skin-files insertion.Nat Goodspeed
Add logic after (both!) LLTransUtil::parseStrings() calls to ensure that "[sourceid]" embedded in (e.g.) strings.xml content will be replaced.
2012-10-15Speeding up cmake configuration, especially on linux. Re-arranged ↵Don Kjer
llrender/llwindow cmake source a bit
2012-10-15Remove LLUICtrlFactory::findSkinnedFilename(): cf. LLDir method.Nat Goodspeed
Richard points out that LLUICtrlFactory::findSkinnedFilename() adds little value. It was called from exactly one place, and that one place could easily obtain the information another way. The concern is that it could confuse a reader of the code with regard to the other findSkinnedFilename[s]() methods in LLDir. Clarifying the code base is a Good Thing. Removing.
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-13Adding libdl to OSMesa16 link lineDon Kjer
2012-10-13Pulling in viewer-gcc4.6 freetype fixesDon Kjer
2012-10-12Fix typoJeff (Gioffredo Linden)
2012-10-12MAINT-1568 Fix for inconsistent triangle counts when changing LoD sources in ↵Dave Parks
model importer
2012-10-12Expose Chat history to VITA by adding getValue method to llchathistory objectJeff (Gioffredo Linden)
2012-10-12Added tag 3.4.1-beta7 for changeset 524da902713eOz Linden
2012-10-12merge changes for DRTVWR-227Oz Linden
2012-10-12tag merge of DRTVWR-227Oz Linden
2012-10-12CHUI Project Viewer initial revisionMerov Linden
2012-10-12Fix for 'no text in release builds' problemBrad Payne (Vir Linden)
2012-10-12MAINT-1649 Fix for objects disappearing on region crossing.Dave Parks
2012-10-12CHUI-385 FIXED All user's do not receive ad hoc messages after adding a user ↵maksymsproductengine
to a conversation
2012-10-12Fix LLUI::locateSkin() failure case; clarify lldir.cpp static init.Nat Goodspeed
Per code review: Previous refactoring of LLUI::locateSkin() preserved odd failure behavior: it would return last-considered pathname, whether or not it exists. Changed to emit LL_WARNS log message and return empty string. Use Boost.Assign to simplify initialization of a couple static containers in lldir.cpp.
2012-10-12LLUICtrlFactory::getLayeredXMLNode() gets LLDir::ESkinConstraint.Nat Goodspeed
At this point, LLUICtrlFactory::getLayeredXMLNode() is a pretty thin wrapper around LLDir::findSkinnedFilenames() and LLXMLNode::getLayeredXMLNode(). Until now, LLUICtrlFactory::getLayeredXMLNode() passed (by default) LLDir::CURRENT_SKIN to LLDir::findSkinnedFilenames(). But that meant that a caller such as LLTransUtil::parseStrings() that wants almost the same functionality, but with LLDir::ALL_SKINS instead, had to clone the logic from LLUICtrlFactory::getLayeredXMLNode(). Allowing its caller to pass the desired LLDir::ESkinConstraint enum value eliminates the need to clone its logic. Remove cloned logic from LLTransUtil::parseStrings().
2012-10-12CHUI-402 (Double-click on conversation participant should begin IM session)MaximB ProductEngine
2012-10-11MAINT-1684: Correcting the calls to ll_aligned_free() which should have ↵William Todd Stinson
actually been to ll_aligned_free_16().
2012-10-11CHUI-380: Fixing a bug that occurred when right clicking nearby chat and ↵Gilbert Gonzales
then right clicking a participant under a conversation. This would result in both the participant and conversation to be highlighted. Still a work in progress. This change involves introducing an old bug CHUI 289 and finding a different approach to solving it.
2012-10-11point to new version of Google Breakpad and tweak function sig of GBP ↵callumprentice
exception handler
2012-10-11Change LLDir::findSkinnedFilenames() to use enum instead of bool.Nat Goodspeed
At Richard's suggestion, changed the bool merge parameter to new enum ESkinConstraint with values CURRENT_SKIN and ALL_SKINS. This clarifies what we're requesting at the point of the call.
2012-10-11MAINT-1684: Attempt at correcting the linux crash on startup. Replacing the ↵William Todd Stinson
memory allocations and frees in the LLPrivateMemoryPool with aligned memory allocations and frees.
2012-10-11Merge revised viewer_manifest.py rename logicNat Goodspeed
2012-10-11Use viewer_manifest.py magic to rename embedded html dir to html.old.Nat Goodspeed
Previous attempt at this same feat copied "*/html" and then iterated through every such directory in the copy-target space, renaming each individually with os.rename(). Richard kindly pointed out that it can be done more simply by using a viewer_manifest.py feature permitting wildcards even in dst= args.
2012-10-11MAINT-1709 Factor out reallocDave Parks
Reviewed by VoidPointer
2012-10-11MAINT-1709 Factor out reallocDave Parks
Reviewed by VoidPointer
2012-10-11Make LLTransUtil::parseStrings() merge all relevant strings.xml files.Nat Goodspeed
Until now, adding a xui/en/strings.xml file in any non-default skin meant you had to clone the entire file, editing only the particular entries you wanted to override. With this change, we load strings.xml file(s) from the default skin before loading the specified skin -- so a non-default skin can now provide a strings.xml file containing only the specific entries it wants to override.
2012-10-11Adding multi-arch hints to CMake, allowing it to correctly find libraries on ↵Don Kjer
multi-arch debian-based systems.
2012-10-11merging in latest changesGilbert Gonzales
2012-10-11CHUI-380: Code cleanup after code review.Gilbert Gonzales
2012-10-11CHUI-380: Before code review changes. Now the user selects a conversation or ↵Gilbert Gonzales
participant of a conversation the correct chat floater will appear. Focus will be redirected to the chat input text box automatically allowing the user to type into the input text box.
2012-10-11Fixes for build issues, missing LLCOMMON_SYSTEM_INCLUDE_DIRS in some librariesBrad Payne (Vir Linden)
2012-10-11CHUI-356 FIXED Call notifyObserverSessionIDUpdated() only after initing IM ↵maxim_productengine
floater with new session id
2012-10-11CHUI-377 (Icons in message panel out of position when nearby chat ↵MaximB ProductEngine
conversation selected) Fixed bug with collapsing messages pane
2012-10-10pull back 3.4.1-beta6 fixesOz Linden
2012-10-11Fix for release build in gcc 4.6Don Kjer
2012-10-11Updating linux build to gcc4.6Don Kjer
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-19 10:00:00 +0000