summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2012-10-22CHUI-428 (Scroll conversation list to the newly created conversation)MaximB ProductEngine
fixed
2012-10-20Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and ↵Don Kjer
CXXFLAG to have cmake generation debug symbols in xcode.
2012-10-20Adding expanded searching for symbols during google breakpad symbol scanDon Kjer
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-19Trying explicitly turning on debug symbols for all mac configurationsDon Kjer
2012-10-19Turn off configs and tests for testinggcallum_linden
2012-10-19CHUI-243: Add calls the parent class's implementation for onFocusReceived() ↵William Todd Stinson
and onFocusLost() to ensure that the focus change messages are properly propagated.
2012-10-19Update to BuildParams varcallum_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-19Turn off cleaning up post build for testingcallum_linden
2012-10-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-19merge back late fix for MAINT-1753Oz Linden
2012-10-19Added tag 3.4.1-beta9 for changeset 637fe8bbee5eOz Linden
2012-10-19merge changes for DRTVWR-233Oz Linden
2012-10-19tag merge of DRTVWR-233Oz Linden
2012-10-19pull back changes from 3.4.1-beta9Oz Linden
2012-10-19CHUI-416 FIXED Check if conversationItem is not NULL before calling getType().maxim_productengine
2012-10-19Added tag 3.4.1-beta9 for changeset 9c4519aa5c70Oz Linden
2012-10-19tag merge of DRTVWR-231Oz Linden
2012-10-19CHUI-418 FIXED Check the existence of mViewModelItem before calling ↵maxim_productengine
potentiallyVisible().
2012-10-18Pull merge from richard/viewer-chuiMerov Linden
2012-10-18CHUI-373 : Fix : Refresh panel after setting parcel for saleMerov Linden
2012-10-18MAINT-1753: Correcting behavior of ll_aligned_realloc_16() on Linux to avoid ↵William Todd Stinson
memory corruption in the case that the new memory size requested is smaller than the old memory size. Also, adding check to ensure that the aligned malloc returns a non-null value before memcopying.
2012-10-18Removing GCC_GENERATE_DEBUGGING_SYMBOLS=NO from xcode projectDon Kjer
2012-10-18Removing -g flag from mac buildsDon Kjer
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-19 23:03:02 +0000