summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Cmake files not merged correctly and had to be done by hand. New memory allocation made some memory usage tests in the llcorehttp integration tests no longer valid. Would like to work on LLLog sometime and get it to be consistent. Special flags needed for windows build of example program.
2012-09-07Mergesimon@Simon-PC.lindenlab.com
2012-09-07Further attempts to erradicate TCMALLOCsimon@Simon-PC.lindenlab.com
2012-09-07MAINT-1494 : Viewer needs new localizable stringssimon@Simon-PC.lindenlab.com
2012-09-07DRTVWR-209 Additional merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Restore original deleteRequest/removeRequest implementation removing a small race. Remove a short-lived additional timeout scheme on requests which really isn't appropriate as originally implemented as we can have very long-lived requests on big regions.
2012-09-07Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-07CHUI-325 FIXED (Cap conversation log to 30 days, purge older data on login)Paul ProductEngine
- Remove conversations older than 30 days from call log
2012-09-07MAINT-1503 Fix for linux buildDave Parks
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
This was yet another refresh from v-d because of significant changes to lltexturefetch that would not have been resolvable by casual application of any merge tool. There are still a few questions outstanding but this is the initial, optimistic merge.
2012-09-07MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS XDave Parks
2012-09-07Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2012-09-07CHUI-323 FIXED (Local chat message panel out of position in Conversation ↵AlexanderP ProductEngine
floater): Prevented too early creation LLNearbyChat
2012-09-10CHUI-268 (Transfer the common functionality from LLNearbyChat and ↵AlexanderP ProductEngine
LLIMFloater to LLIMConversation): moved appendMessage() to base class
2012-09-06Pull merge from richard/viewer-chuiMerov Linden
2012-09-06CHUI-285 : Completed. Update the names of the participants.Merov Linden
2012-09-06Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-06Do the proper fix this time...Baker Linden
2012-09-06Added explicit casting for Linux build, hopefully making it work.Baker Linden
2012-09-06CHUI-318 FIXED (User cannot navigate forward in chat history viewer once the ↵Paul ProductEngine
More History option is selected.) - Added spinner so that user could select desired history page. Also displaying total count of pages.
2012-09-06CHUI-324 FIXED (No sort order field set by default in conversation log)Paul ProductEngine
- Corrected value in settings XML
2012-09-06CHUI-320 FIXED (Inconsistent name formatting in conversation log depending ↵Paul ProductEngine
if user started conversation or not) - On P2P session started, before creating entry of conversation log, requesting avatar name in form of Display Name (user.name)
2012-09-06CHUI-319 FIXED ("User has said something new" text shown when navigating ↵Paul ProductEngine
chat history with More History button) - Added flag to chat history whether to show notification about unread messages or not
2012-09-06Mergesimon@Simon-PC.lindenlab.com
2012-09-06DRTVWR-232: MAINT-1440: FIXED Call Tools.TakeCopy instead of ↵maxim_productengine
InspectObject.TakeFreeCopy
2012-09-06MAINT-1440 FIXED Call Tools.TakeCopy instead of InspectObject.TakeFreeCopymaxim_productengine
2012-09-06MAINT-1183 FIXED Tooltip text is changedmaxim_productengine
2012-09-05CHUI-285 : Clear the needs refresh flag when refreshing, comment clean up.Merov Linden