summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-04merge changes for DRTVWR-207Oz Linden
2012-09-04merge changes for DRTVWR-206Oz Linden
2012-09-04tag merge of DRTVWR-206Oz Linden
2012-09-03CHUI-314 FIXED (Update Save IM logs on my computer setting to also control ↵Paul ProductEngine
populatoin of conversation log) - Now LLConversationLog is optionally listener of IMSession, dependently on "LogInstantMessages" per account setting, saving of call log to file also depends on this setting. Which means that with the Save IM logs on my computer disabled: IM logs for the user will not be saved to their computer and conversations will not be logged to the conversation log.
2012-09-03CHUI-307 FIXED (LLInitParam::Parser::parserWarnings in log when adding ↵Paul ProductEngine
conversations or deleting entries from conversation log ) - removed redundant incorrect attributes
2012-08-31- Fixed an issue where service was called twice in a frameChris Baker
- Changed level of output logs - Cleaned up comments
2012-08-31merge changes forOz Linden
2012-08-31Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-08-31merging in latest changesGilbert Gonzales
2012-08-31merging in latest changesGilbert Gonzales
2012-08-31CHUI-298 FIXED (Conversation started as an IM and then goes to voice call ↵Paul ProductEngine
does not show as call in conversation log) - Show voice icon when call is started - Added flag LLConversation::mIsConversationPast which means that this conversation is finished and any of its data can't be changed. I.e. it cannot be reused. - When session removed (i.e. finished) corresponding conversation is marked as Past conversation. I.e. mIsConversationPast is true. - Added changed(const LLUUID& session_id, U32 mask) method to LLConversationLog to notify particular conversation. This is used in LLConversationLogList to update its particular item and not to rebuild the whole list.
2012-08-31Copy sourceid= from create_account_url to login-page URL.Nat Goodspeed
This allows the login-page server to respond to any sourceid= associated with the create_account_url, which (we happen to know) varies by skin -- e.g. for the Steam viewer.
2012-08-31Now that LLURI isn't broken, use it to construct login-page URL.Nat Goodspeed
Previous logic constructed a std::ostringstream, directly messing with '?' vs. '&', ugly libcurl escape calls etc. Now we can deconstruct the LLGridManager:: getLoginPage() URL, supplement the params map as needed and then rebuild a new URL using LLURI::buildHTTP().
2012-08-31Fix longstanding LLURI::buildHTTP() bug when passing string path.Nat Goodspeed
The LLURI::buildHTTP() overloads that take an LLSD 'path' accept 'undefined', LLSD::String and (LLSD::Array of LLSD::String). A sequence of path components passed in an Array is constructed into a slash-separated path. There are unit tests in lluri_test.cpp to exercise that case. To my amazement, there were NO unit tests covering the case of an LLSD::String path. The code for that case escaped and appended the entire passed string. While that might be fine for a 'path' consisting of a single undecorated path component, the available documentation does not forbid one from passing a path containing slashes as well. But this had the dubious effect of replacing every slash with %2F. In particular, decomposing a URL string with one LLURI instance and constructing another like it using LLURI::buildHTTP() was not symmetrical. Having consulted with Richard, I made the string-path logic a bit more nuanced: - The passed path string is split on slashes. Every path component is individually escaped, then recombined with slashes into the final path. - Duplicate slashes are eliminated. - The presence or absence of a trailing slash in the original path string is carefully respected. Now that we've nailed down how it ought to behave -- added unit tests to ensure that it DOES behave that way!!
2012-08-31CHUI-315 (Nearby chat messages do not appear in conversation floater): ↵AlexanderP ProductEngine
cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it.
2012-08-31Added tag 3.3.4-release3 for changeset 351eea5f9dc1Oz Linden
2012-08-31tag merge of DRTVWR-207Oz Linden
2012-08-31CHUI-154 FIXED (Add link to chat preferences from Conversation floater)Paul ProductEngine
- Added link to chat preferences from Conversation floater
2012-08-31CHUI-157 FIXED (Implement menu bar for conversation floater)Paul ProductEngine
- Added View Nearby chat history option - Also replaced menu item "Add Friend / Remove" with two separate menus: Add Friend and Remove Friend. So if user is a Friend the Remove Friend option would be shown there. If the user is not a friend, the Add Friend option would be shown.
2012-08-30CHUI-285 : LLIMFloaterContainer is now using LLParticipantList fullyMerov Linden
2012-08-30CHUI-305: Now the Region/Estate floater displays the frustum shadow when ↵Gilbert Gonzales
opening the Resident Picker.
2012-08-30CHUI-305: Minor changes after code review. Using templated findChild() ↵Gilbert Gonzales
instead of getChildView(). Also using settings.xml to store common custom variables.
2012-08-30Added tag 3.4.0-beta5 for changeset 573e863be2f2Oz Linden
2012-08-30WIP INTL-46 Set24 translation for traditional chinese; add new files; remove ↵eli
obsolete files
2012-08-30FIX INTL-101 translation of set33 for 8 languages; add new files; remove ↵eli
obsolete files
2012-08-29merging in latest changesGilbert Gonzales
2012-08-29CHUI-305: Problem: The 'resident picker' had multiple parents and due to the ↵Gilbert Gonzales
design of the resident picker it can have only one parent. Having multiple parents caused both parents to fight for depth ordering...which caused the flickering. Resolution: Now multiple 'resident pickers' can exist and they are coupled to the floater that spawned then. Meaning that when the parent floater closes, the 'resident picker' floater will also close. In addition, a shadow frustum eminates from the button that opened the 'resident picker'.
2012-08-29MAINT-1491 Make GPU table more readable, clear out some cruft, and start ↵Dave Parks
reporting raw GL strings in viewer stats instead of GPU table labels to make future GPU table overhauls more effective.
2012-08-29CHUI-285 : WIP : Get the conversation floater to use the same ↵Merov Linden
LLParticipantList as the IM and call dialog
2012-08-29MAINT-1491 Add Intel HD Graphics entries.Dave Parks
2012-08-29merge changes for DRTVWR-205Oz Linden
2012-08-29tag merge of DRTVWR-205Oz Linden
2012-08-29MAINT-1491 Add Radeon HD 7xxx chips, get rid of "ATI Technologies" catch ↵Dave Parks
all, split up NVIDIA GT(X) 6xx series into mobile/desktop.
2012-08-29WIP INTL-46 Traditional Chinese translation for Set23TW (120829)eli
2012-08-29MAINT-1497 Remove "ATI Geforce" lines (also add "expected OpenGL version" field)Dave Parks
2012-08-29MAINT-1455 FIX Media Texture not visually updated correctlycallum
Reviewed by me. (Bao created)
2012-08-29Pull merge from richard/viewer-chuiMerov Linden
2012-08-29CHUI-280 : Add print out debug methodsMerov Linden
2012-08-29Added tag oz-build-test-tag for changeset 34dbbe2b00afOz Linden
2012-08-28CHUI-280 : Implement all LLConversationModel updates in LLParticipantList. ↵Merov Linden
Allow mAvatarList to be NULL.
2012-08-28CHUI-280 : WIP : Implement update of LLConversationModel in LLParticipantListMerov Linden
2012-08-28Got viewer displaying new data formatChris Baker
2012-08-28MAINT-1491 Tuned analysis function for more consistent resultsDave Parks
2012-08-28MAINT-1491 Integration of statistically generated GPU table -- enable ↵Dave Parks
shadows by default where appropriate.
2012-08-28CHUI-287 FIX IM toast panel is closed upon mouse up and doesn't pass the ↵Seth ProductEngine
mouse click that activates "click to walk".
2012-08-28BUILDFIX: Correcting a linux build error.William Todd Stinson
2012-08-28CHUI-275 FIXED (Chat history viewer does not show entire user.txt IM log file)Paul ProductEngine
- Renamed LLLogChat::loadAllHistory to LLLogChat::loadChatHistory because it doesn't actually loads all history. Also added parameter to the function which is a flag whether to load all file's content or not. - Implemented displaying history by pages (as was decided on meeting page): Added showHistory() method to the LLFloaterConversationPreview which shows the chat history page by page starting from the last conversation (or may say starting from the last page). One page contains 100 entries. Added "More history..." button to display next page of history.
2012-08-27MAINT-1480: Ensuring that the new angular velocity is remembered for later ↵William Todd Stinson
comparison to the previous angular velocity.
2012-08-27Skipping the realloc alignment test on Linux as the ll_aligned_malloc_16() ↵William Todd Stinson
function is not implemented to ensure alignment on Linux.
2012-08-27PATH-868: Ensuring that walkability values are reset to a previous value if ↵Todd Stinson
the empty string is entered.