[XP Tools] Initial merge Cherry Pick Also modernize llfloaterauction internally, but leave the ui the same for now. Breaks out script_question_mute() in llviewermessage.cpp to better sync with upstream Adds support for UnknownScriptQuestion notification (translators need to translate this one~) RLVa note: Rewrote RLVa permissions handling block just a bit. Added 13 new capabilities from the XP Tools, I doubt all of them really exist. Minor update to LLComboBox, decided against implementing LLIconsComboBox for now. Modified LLExperienceLog::notify to lookup names and display them along with the slurls since our editors don't do that automatically. Experience tweak: Changed a few notify's to notifytips so that we can click the links to experience profiles from chat instead of via hacked in buttons Migrated LLFloaterCompileQueue to a proper Instance Tracker so we can call getKey Modernized LLSD, gives us reverse iterators and the new debugging impl. We needed the reverse iterators. Experience tweak: Added virtual destructors to responders. Updated llhandle.h to allow calling getDerivedHandle in public. Updated LLScrollContainer and LLScrollBar to be more modern. Added LLFlatListView/flat_list_view from upstream - these don't seem work though? Added some newer login/logout strings to strings.xml Thanks for the default timeout policies, Aleric~ To avoid needing to scroll through tabs, about land tabs now are as big as they need to be to display their labels, same on groups Group Members and Roles has been renamed to just Members because this allows the new Experiences tab enough room to display. Thanks to Henri Beauchamp (Cool VL Viewer) for the setupList augmentation. (without it, I'd still be stuck) Thanks to Shyotl for the helpsies~ Added the LSL constants, events, and functions that LL neglected to put in. Added click callbacks and name lookups for profile linky texts~ Merge is up to 22b4cdc Old TODO: Get the uis looking nice (profiles? Experiences... floater) - done Old TODO: Make sure flatlistviews look okay... - Not using Old TODO: Fix LLFloaterExperiencePicker, right now the panel does not show. - unsure Old TODO: Remove the llfloaterabout.cpp change. - done Merges llexperiencecache with upstream and unstable Introduces LLCoroResponder, TODO: Make everything use this. Updates Reporter floater to the latest, supports the new cap thingy Also adds these commits/changes: [XPTools] Double clicking experiences in namelists should open the profile Add List.CopyNames support for Experiences [XP Tools] Some UI work, I'll do more later [XPTools] More UI Stuff, Later is now! Allow getSLURL for experiences WIP Experience list menu Also make EXPERIENCE > OBJECT, because mainline started OBJECT already [XPTools] Add Experience support to Name UI [XPTools] Fix experience profile UI 9c3067e843265587e91c659200a8d783acf2d9b2 [XPTools] Fix experience location showing "last" and getting set to "last" [XPTools] Move Experiences floater from view menu to world menu [XPTools] Fix up more UI [XPTools] Fix experiences panels [XPTools] Hide pieces of the Experiences menu when they're not usable [XPTools] More UI work, mostly to get the menus working [XPTools] The events list is for events, not experiences, remove menu # Conflicts: # indra/llcommon/llsd.cpp - merge with unstable branch # indra/llmessage/message_prehash.cpp # indra/llmessage/message_prehash.h # indra/llui/llscrollbar.cpp # indra/llui/llscrollcontainer.cpp # indra/llui/llurlentry.cpp # indra/llui/llurlregistry.cpp # indra/newview/app_settings/keywords.ini # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h # indra/newview/llassetuploadresponders.cpp # indra/newview/llcompilequeue.* - merge stable # indra/newview/llfloaterabout.cpp # indra/newview/llfloaterland.* - merge unstable # indra/newview/llfloaterproperties.cpp # indra/newview/llfloaterregioninfo.* - merge unstable # indra/newview/llmenucommands.cpp - merge unstable # indra/newview/llpreviewscript.cpp - merge unstable # indra/newview/llviewermessage.cpp - merge unstable # indra/newview/llviewerregion.cpp - merge unstable # indra/newview/skins/default/textures/textures.xml - merge unstable # indra/newview/skins/default/xui/en-us/strings.xml - merge unstable
153 lines
5.6 KiB
C++
153 lines
5.6 KiB
C++
/**
|
|
* @file llstartup.h
|
|
* @brief startup routines and logic declaration
|
|
*
|
|
* $LicenseInfo:firstyear=2004&license=viewergpl$
|
|
*
|
|
* Copyright (c) 2004-2009, Linden Research, Inc.
|
|
*
|
|
* Second Life Viewer Source Code
|
|
* The source code in this file ("Source Code") is provided by Linden Lab
|
|
* to you under the terms of the GNU General Public License, version 2.0
|
|
* ("GPL"), unless you have obtained a separate licensing agreement
|
|
* ("Other License"), formally executed by you and Linden Lab. Terms of
|
|
* the GPL can be found in doc/GPL-license.txt in this distribution, or
|
|
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
|
|
*
|
|
* There are special exceptions to the terms and conditions of the GPL as
|
|
* it is applied to this Source Code. View the full text of the exception
|
|
* in the file doc/FLOSS-exception.txt in this software distribution, or
|
|
* online at
|
|
* http://secondlifegrid.net/programs/open_source/licensing/flossexception
|
|
*
|
|
* By copying, modifying or distributing this software, you acknowledge
|
|
* that you have read and understood your obligations described above,
|
|
* and agree to abide by those obligations.
|
|
*
|
|
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
|
|
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
|
|
* COMPLETENESS OR PERFORMANCE.
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#ifndef LL_LLSTARTUP_H
|
|
#define LL_LLSTARTUP_H
|
|
|
|
#include <boost/scoped_ptr.hpp>
|
|
|
|
class LLViewerTexture ;
|
|
class LLEventPump;
|
|
class LLSLURL;
|
|
|
|
#include "llviewerstats.h"
|
|
|
|
// functions
|
|
bool idle_startup();
|
|
void release_start_screen();
|
|
bool login_alert_done(const LLSD& notification, const LLSD& response);
|
|
|
|
// constants, variables, & enumerations
|
|
extern std::string SCREEN_HOME_FILENAME;
|
|
extern std::string SCREEN_LAST_FILENAME;
|
|
|
|
typedef enum {
|
|
STATE_FIRST, // Initial startup
|
|
STATE_BROWSER_INIT, // Initialize web browser for login screen
|
|
STATE_LOGIN_SHOW, // Show login screen
|
|
STATE_LOGIN_WAIT, // Wait for user input at login screen
|
|
STATE_LOGIN_CLEANUP, // Get rid of login screen and start login
|
|
STATE_LOGIN_VOICE_LICENSE, // Show license agreement for using voice
|
|
STATE_UPDATE_CHECK, // Wait for user at a dialog box (updates, term-of-service, etc)
|
|
STATE_LOGIN_AUTH_INIT, // Start login to SL servers
|
|
STATE_XMLRPC_LEGACY_LOGIN, // XMLRPC for legacy login, OGPX maintain legacy XMLRPC
|
|
STATE_LOGIN_NO_DATA_YET, // Waiting for authentication replies to start
|
|
STATE_LOGIN_DOWNLOADING, // Waiting for authentication replies to download
|
|
STATE_LOGIN_PROCESS_RESPONSE, // Check authentication reply
|
|
STATE_WORLD_INIT, // Start building the world
|
|
STATE_MULTIMEDIA_INIT, // Init the rest of multimedia library
|
|
STATE_FONT_INIT, // Load default fonts
|
|
STATE_SEED_GRANTED_WAIT, // Wait for seed cap grant
|
|
STATE_SEED_CAP_GRANTED, // Have seed cap grant
|
|
STATE_WORLD_WAIT, // Waiting for simulator
|
|
STATE_AGENT_SEND, // Connect to a region
|
|
STATE_AGENT_WAIT, // Wait for region
|
|
STATE_INVENTORY_SEND, // Do inventory transfer
|
|
STATE_MISC, // Do more things (set bandwidth, start audio, save location, etc)
|
|
STATE_PRECACHE, // Wait a bit for textures to download
|
|
STATE_WEARABLES_WAIT, // Wait for clothing to download
|
|
STATE_CLEANUP, // Final cleanup
|
|
STATE_STARTED // Up and running in-world
|
|
} EStartupState;
|
|
|
|
// exported symbols
|
|
extern bool gAgentMovementCompleted;
|
|
extern LLPointer<LLViewerTexture> gStartTexture;
|
|
extern std::string gInitialOutfit;
|
|
extern std::string gInitialOutfitGender; // "male" or "female"
|
|
|
|
class LLStartUp
|
|
{
|
|
public:
|
|
static bool canGoFullscreen();
|
|
// returns true if we are far enough along in startup to allow
|
|
// going full screen
|
|
|
|
// Always use this to set gStartupState so changes are logged
|
|
static void setStartupState( EStartupState state );
|
|
static EStartupState getStartupState() { return gStartupState; };
|
|
static std::string getStartupStateString() { return startupStateToString(gStartupState); };
|
|
|
|
static void multimediaInit();
|
|
// Initialize LLViewerMedia multimedia engine.
|
|
|
|
// Load default fonts not already loaded at start screen
|
|
static void fontInit();
|
|
|
|
static void initNameCache();
|
|
static void initExperiences();
|
|
|
|
static void cleanupNameCache();
|
|
|
|
// outfit_folder_name can be a folder anywhere in your inventory,
|
|
// but the name must be a case-sensitive exact match.
|
|
// gender_name is either "male" or "female"
|
|
static void loadInitialOutfit( const std::string& outfit_folder_name,
|
|
const std::string& gender_name );
|
|
|
|
//save loaded initial outfit into My Outfits category
|
|
static void saveInitialOutfit();
|
|
|
|
static std::string& getInitialOutfitName();
|
|
|
|
// Load MD5 of user's password from local disk file.
|
|
static std::string loadPasswordFromDisk();
|
|
|
|
// Record MD5 of user's password for subsequent login.
|
|
static void savePasswordToDisk(const std::string& hashed_password);
|
|
|
|
// Delete the saved password local disk file.
|
|
static void deletePasswordFromDisk();
|
|
|
|
static bool dispatchURL();
|
|
// if we have a SLURL or sim string ("Ahern/123/45") that started
|
|
// the viewer, dispatch it
|
|
|
|
static void postStartupState();
|
|
static void setStartSLURL(const LLSLURL& slurl);
|
|
static LLSLURL& getStartSLURL();
|
|
|
|
static bool startLLProxy(); // Initialize the SOCKS 5 proxy
|
|
|
|
static LLViewerStats::PhaseMap& getPhases() { return *sPhases; }
|
|
private:
|
|
static LLSLURL sStartSLURL;
|
|
|
|
static std::string startupStateToString(EStartupState state);
|
|
static EStartupState gStartupState; // Do not set directly, use LLStartup::setStartupState
|
|
static boost::scoped_ptr<LLEventPump> sStateWatcher;
|
|
static boost::scoped_ptr<LLViewerStats::PhaseMap> sPhases;
|
|
};
|
|
|
|
|
|
#endif // LL_LLSTARTUP_H
|