summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-12re-merge changes to disable tcmallocOz Linden
2012-09-12merging in latest changesGilbert Gonzales
2012-09-12CHUI-283: Now the speaker icon and information icon are functional.Gilbert Gonzales
2012-09-12merge increment of version numberOz Linden
2012-09-12increment version to 3.4.2Oz Linden
2012-09-12Added tag 3.4.0-release for changeset d02759655d6bOz Linden
2012-09-12Another attempt at unsticking build.Dave Parks
2012-09-12Attempt to unblock build.Dave Parks
2012-09-12Automated merge with http://bitbucket.org/oz_linden/viewer-beta-notcmallocDave Parks
2012-09-12MAINT-1503 Minimal set of changes needed to safely disable tcmallocDave Parks
2012-09-12Fixing merge conflicts related to restoring DRTVWR-167 changesBrad Payne (Vir Linden)
2012-09-12initial attempt to restore changes that make removing tcmalloc possible; not ↵Oz Linden
tested
2012-09-12Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-09-12Handle the NULL case on ll_aligned_realloc_16 on linuxDave Parks
2012-09-12MAINT-499 FIXED Don't call handleRightClickPick() in mouselook modemaxim_productengine
2012-09-12CHUI-335 FIXED (Alpha text allowed in page spinner in chat history viewer)Paul ProductEngine
- Added XML parameter "allow_digits_only" to spinner control widget, which disables/enables ability to input alpha text. - Disabled ability to enter alpha text in page spinner in chat history viewer
2012-09-11merging in latest changesGilbert Gonzales
2012-09-11Automated merge with https://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-09-11MAINT-1556 FIX LLSD param blocks should accept enum valuesRichard Linden
always parse named values first added detection of enum-type values and now parse as ints
2012-09-11Another stab at fixing alignment_test.cppDave Parks
2012-09-11MAINT-1534 Fix for calls to find widgets getting out of hand.Dave Parks
2012-09-11Resync steam/xui/*/strings.xml with default/xui/*/strings.xml.Nat Goodspeed
The steam/xui/*/strings.xml files are intended only to override a single string (create_account_url). But until the strings.xml C++ code supports fallback to the default skin, we must manually keep them synchronized except for that one string.
2012-09-11Merge up to http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-09-11CHUI-336 FIXED (Remove Description label and field from Chat history viewer)Paul ProductEngine
- Removed lineeditor and text box from code and xml
2012-09-11Added tag 3.3.4-beta6 for changeset 62b07aa81b19Oz Linden
2012-09-11CHUI-326 FIXED (One entry per conversation with a user in conversation log ↵Paul ProductEngine
timestamped with most recent utterance/activity.) - Modified LLConversationLog to show only one entry per conversation with user. I.e. there can't be two conversations with the same session_id in LLConversationLog. - Got rid of processing voice sessions - Refactored creation of conversation in LLConversationLog - Refactored a little bit LLConversation and LLConversationLog: function names and made some functions private
2012-09-11merge changes for DRTVWR-213Oz Linden
2012-09-11tag merge of DRTVWR-213Oz Linden
2012-09-11merge changes for DRTVWR-212Oz Linden
2012-09-11tag merge of DRTVWR-212Oz Linden
2012-09-10Fixed line endings from DOS to UNIX.Baker Linden
2012-09-10FIX INTL-104 Translation of Set34 in 8 languages, including Steam contenteli
2012-09-10FIX INTL-106 French linguistic fixeseli
2012-09-10Fix for alignment_test.cpp compilation errors.Dave Parks
2012-09-10CHUI-283: Now displaying the speaker icon instead of the profile iconGilbert Gonzales
2012-09-10Attempt to fix Linux buildMerov Linden
2012-09-10Pull merge from richard/viewer-chuiMerov Linden
2012-09-10inconsequential change to force new buildOz Linden
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-10CHUI-282 WIP Modified conversation view item and IM floater container so ↵Seth ProductEngine
that the folder view handles the positioning of items in conversations list.
2012-09-10CHUI-283, fixed a build problem and also added a missing file.Gilbert Gonzales
2012-09-10MAINT-1515 FIXED min_height is increased to avoid overlappingmaxim_productengine
2012-09-10MAINT-826 FIXED Show the first subpart by defaultmaxim_productengine
2012-09-10CHUI-283: Basic Implementation, just have hard coded avatar icon appearing ↵Gilbert Gonzales
and profile/info buttons visible. profile/info buttons do not have proper positioning or mouseclick events.
2012-09-10CHUI-332 (Overlap of icons in chrome when collapsing and expanding ↵AlexanderP ProductEngine
conversation list) changed expanded_min_dim of the right panel
2012-09-10CHUI-333 (Icons overlap in message panel when maximizing width of ↵AlexanderP ProductEngine
conversation list): increaced expanded_min_dim for the message pane
2012-09-09Pull merge richard/viewer-chuiMerov Linden
2012-09-09CHUI-285 : Complete. Fix participants repositioning.Merov Linden
2012-09-08DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
cmake and other files didn't get moved over, do it by hand.
2012-09-07CHUI-285 : Implement sort, alphabetical only for the momentMerov Linden