summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
AgeCommit message (Collapse)Author
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-02-13CHUI-743 FIXED CHUI viewer ignores pre chui users Privacy settings to not ↵maksymsproductengine
keep IM logs and nearby chat logs
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-30merge downstream code from viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-07CHUI-580 : Fixed : Clean up the use of display name. Allow the use of the ↵Merov Linden
legacy protocol in settings.xml
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-04CHUI-504 FIXED Open Conversation floater on first login.AlexanderP ProductEngine
added toggleInstanceOrBringToFront("im_container") to LLStartup; typo corr.
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-09CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and ↵AlexanderP ProductEngine
in accordance with the naming convention in the project, some classes and corresponding files should be renamed: LLIMConversation -> LLFloaterIMSessionTab LLIMFloater -> LLFloaterIMSession LLNearbyChat -> LLFloaterIMNearbyChat LLIMFloaterContainer -> LLFloaterIMContainer LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-10-10Remove HelpUseLocal setting variable. Hide local html skin dir.Nat Goodspeed
We assert that the local html directory is no longer used. Remove machinery related to its use, notably HelpUseLocal, the code that checks it and the code that sets and examines special flag URL "__local". Before actually killing off the local skins/default/html directory, make viewer_manifest.py rename it but continue packaging it as html.old. If this doesn't cause a panic, we can proceed with removing it entirely.
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-24Automated merge with http://bitbucket.org/lindenlab/viewer-catRichard Linden
2012-08-22CHUI_310 make NearbyChat a singletoneAlexanderP ProductEngine
2012-08-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-15merge changes for DRTVWR-194Oz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-09MAINT-1342: correct initial login location handling, clarify the two related ↵Oz Linden
persistent settings
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-02Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-27Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.Todd Stinson
2012-07-27Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-27CHUI-151 FIXED (Implement conversation log)Paul ProductEngine
A brief explanation of what have been implemented. More information can be found in comments. 1. Created conversation history viewer (llfloaterconversationpreview) 2. Created LLConversation and LLConversationLog classes which represent and hold data of conversations (llconversationlog) 3. Created LLConversationLogList and LLConversationLogListItem which are the visual representation of LLConversationLog and LLConversation respectively 4. Created LLFloaterConversationLog - which holds and displays LLConversationLogList
2012-07-24Engage dormant first-login-this-install popup message.Nat Goodspeed
Although the XUI for this popup, and the code to display and respond to it, have been present from the first rev in the current viewer repository, I can find no trace of it ever having been called. Reword embedded link in popup message in each supported language: directly mentioning secondlife.com in display text engages anti-URL-spoofing logic, causing the popup to display the whole messy URL with sourceid and lang params. Change to say "Second Life web site" instead -- needs translations.
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-18SH-3275 WIP Run viewer metrics for object update messagesRichard Linden
continued clean up of llstats stuff
2012-08-01Merge back viewer-lion, which has viewer-development and down-stream fixessimon@Simon-PC.lindenlab.com
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
2012-06-26PATH-773: correct update of grid and location selectors for arbitrary locationsOz Linden
2012-06-25merge up to 3.3.3-release + pathfindingOz Linden
2012-06-25PATH-773: fix up how the location and grid selectors work on the login panelOz Linden
2012-06-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-06-21merge changes for DRTVWR-168Oz Linden
2012-06-21merge changes for DRTVWR-171Oz Linden
2012-06-19PATH-723: Pulling in whether the user has access to view the rebake navmesh ↵Todd Stinson
button or not.
2012-06-19merge up to latest viewer-development-havokaiOz Linden
2012-06-19Don't display the rebake navmesh button while SL splash screen is upprep
2012-06-15path-722: At startup we request the agent status update.prep
2012-06-12PATH-735: Limit and clean up grid selectionOz Linden
2012-06-11PATH-711: Implementing Leo's changes for the pathfinding console.Todd Stinson
2012-06-11avatar metrics - cleanup, removed unused fieldsBrad Payne (Vir Linden)
2012-06-11CHUI-119 WIP Fixed some bugsAlexanderP ProductEngine
2012-06-07CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P ↵Seth ProductEngine
chat, after adding more participants. - Added a parameter to LLAvatarActions::startConference() and LLIMMgr::addSession() to pass the uuid of a P2P IM floater which should be used to start a new conference in it. - In LLChicletBar::sessionRemoved() we don't close the IM floater if it is going to be re-used for a new conference.
2012-06-01CHUI-119 FIXED Bug fixed. Clean up a codeAlexanderP ProductEngine
2012-05-25Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148simon@Simon-PC.lindenlab.com
2012-05-23Removing cruft code that is no longer used.Todd Stinson