1 files changed, 136 insertions, 28 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index ab4d8a9..52aa1eb 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -125,6 +125,7 @@
 #include "llvectorperfoptions.h"
 #include "llurlsimstring.h"
 #include "llwatchdog.h"
+#include "llcallingcard.h"
 
 // Included so that constants/settings might be initialized
 // in save_settings_to_globals()
@@ -164,6 +165,10 @@
 
 #include "llcommandlineparser.h"
 
+#include "hippoGridManager.h"
+#include "hippoLimits.h"
+#include "hippoUpdate.h"
+
 // annoying detail to determine whether font prefs are over-ridden
 #if LL_LINUX
 # define LL_DYNAMIC_FONT_DISCOVERY 1
@@ -192,22 +197,35 @@
 
 //----------------------------------------------------------------------------
 // viewer.cpp - these are only used in viewer, should be easily moved.
+extern void disable_win_error_reporting();
 
 #if LL_DARWIN
+#include <Carbon/Carbon.h>
 extern void init_apple_menu(const char* product);
+extern OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
+extern OSErr AEQuitHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
+extern OSStatus simpleDialogHandler(EventHandlerCallRef handler, EventRef event, void *userdata);
+#include <boost/tokenizer.hpp>
 #endif // LL_DARWIN
 
+
 extern BOOL gRandomizeFramerate;
 extern BOOL gPeriodicSlowFrame;
 extern BOOL gDebugGL;
 
 ////////////////////////////////////////////////////////////
 // All from the last globals push...
+
+
 const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user flagged as Away From Keyboard
 
 F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
 F32 gSimFrames;
 
+std::string gDisabledMessage; // Set in LLAppViewer::initConfiguration used in idle_startup
+
+BOOL gHideLinks = FALSE; // Set in LLAppViewer::initConfiguration, used externally
+
 BOOL gAllowIdleAFK = TRUE;
 BOOL gAllowTapTapHoldRun = TRUE;
 BOOL gShowObjectUpdates = FALSE;
@@ -233,7 +251,7 @@ F32 gFPSClamped = 10.f;						// Pretend we start at target rate.
 F32 gFrameDTClamped = 0.f;                                      // Time between adjacent checks to network for packets
 U64     gStartTime = 0; // gStartTime is "private", used only to calculate gFrameTimeSeconds
 U32 gFrameStalls = 0;
-const F64 FRAME_STALL_THRESHOLD = 1.0;
+const F64 FRAME_STALL_THRESHOLD = 5.0;
 
 LLTimer gRenderStartTime;
 LLFrameTimer gForegroundTime;
@@ -302,7 +320,8 @@ std::string gLoginPage;
 std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
-LLAppViewer::LLUpdaterInfo *LLAppViewer::sUpdaterInfo = NULL ;
+//FIXME 
+//LLAppViewer::LLUpdaterInfo *LLAppViewer::sUpdaterInfo = NULL ;
 
 void idle_afk_check()
 {
@@ -453,7 +472,7 @@ static void settings_modify()
         gSavedSettings.setBOOL("VectorizeSkin", FALSE);
 #endif
 }
-
+/*
 void LLAppViewer::initGridChoice()
 {
         // Load up the initial grid     choice from:
@@ -470,7 +489,7 @@ void LLAppViewer::initGridChoice()
         if(grid_choice.empty())
         {
                 S32     server = gSavedSettings.getS32("ServerChoice");
-                server = llclamp(server, 0,     (S32)GRID_INFO_COUNT - 1);
+                //server = llclamp(server, 0,   (S32)GRID_INFO_COUNT - 1);
                 if(server == GRID_INFO_OTHER)
                 {
                         std::string custom_server = gSavedSettings.getString("CustomServer");
@@ -478,11 +497,12 @@ void LLAppViewer::initGridChoice()
                 }
                 else if(server != (S32)GRID_INFO_NONE)
                 {
-                        LLViewerLogin::getInstance()->setGridChoice((EGridInfo)server);
+                        llwarns << "setgridchoice = " << server << llendl;
+                        LLViewerLogin::getInstance()->setGridChoice(server);
                 }
         }
 }
-
+*/
 //virtual
 bool LLAppViewer::initSLURLHandler()
 {
@@ -521,6 +541,7 @@ LLAppViewer::LLAppViewer() :
         mSecondInstance(false),
         mSavedFinalSnapshot(false),
         mQuitRequested(false),
+        mLogoutRequested(false),
         mLogoutRequestSent(false),
         mYieldTime(-1),
         mMainloopTimeout(NULL),
@@ -662,7 +683,6 @@ bool LLAppViewer::init()
                                         ui_audio_callback,
                                         &LLUI::sGLScaleFactor);
         LLWeb::initClass();                       // do this after LLUI
-
         LLTextEditor::setURLCallbacks(&LLWeb::loadURL,
                                 &LLURLDispatcher::dispatchFromTextEditor,
                                 &LLURLDispatcher::dispatchFromTextEditor);
@@ -683,6 +703,7 @@ bool LLAppViewer::init()
         // load MIME type -> media impl mappings
         LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") ); 
 
+
         // Copy settings to globals. *TODO: Remove or move to appropriage class initializers
         settings_to_globals();
         // Setup settings listeners
@@ -1117,12 +1138,21 @@ bool LLAppViewer::cleanup()
         // to ensure shutdown order
         LLMortician::setZealous(TRUE);
 
+        if (mQuitRequested)
         LLVoiceClient::terminate();
         
         disconnectViewer();
 
         llinfos << "Viewer disconnected" << llendflush;
 
+
+
+
+
+        //this deletes all your buddies
+        LLAvatarTracker::instance().reset();
+
+        if (mQuitRequested)
         display_cleanup(); 
 
         release_start_screen(); // just in case
@@ -1137,6 +1167,13 @@ bool LLAppViewer::cleanup()
 
         LLKeyframeDataCache::clear();
         
+        //clear all the chat off the screen     
+        gConsole->clear();
+
+        if (!mQuitRequested) //if we are doing a soft cleanup, bail here
+        {
+                return true;
+        }
         // End TransferManager before deleting systems it depends on (Audio, VFS, AssetStorage)
 #if 0 // this seems to get us stuck in an infinite loop...
         gTransferManager.cleanup();
@@ -1242,6 +1279,9 @@ bool LLAppViewer::cleanup()
         // viewer UI relies on keyboard so keep it aound until viewer UI isa gone
         delete gKeyboard;
         gKeyboard = NULL;
+        // Clean up selection managers after UI is destroyed, as UI
+        // may be observing them.
+        LLSelectMgr::cleanupGlobals();
 
         LLViewerObject::cleanupVOClasses();
 
@@ -1251,6 +1291,7 @@ bool LLAppViewer::cleanup()
 
         LLTracker::cleanupInstance();
         
+
         // *FIX: This is handled in LLAppViewerWin32::cleanup().
         // I'm keeping the comment to remember its order in cleanup,
         // in case of unforseen dependency.
@@ -1319,6 +1360,7 @@ bool LLAppViewer::cleanup()
         // save mute list. gMuteList used to also be deleted here too.
         LLMuteList::getInstance()->cache(gAgent.getID());
 
+
         if (mPurgeOnExit)
         {
                 llinfos << "Purging all cache files on exit" << llendflush;
@@ -1819,7 +1861,14 @@ bool LLAppViewer::initConfiguration()
         }
     }
 
-    initGridChoice();
+        //init Hippo grid manager
+        if (!gHippoGridManager) {
+                gHippoGridManager = new HippoGridManager();
+                gHippoGridManager->init();
+        }
+
+
+    //initGridChoice();
 
         // If we have specified crash on startup, set the global so we'll trigger the crash at the right time
         if(clp.hasOption("crashonstartup"))
@@ -1836,7 +1885,6 @@ bool LLAppViewer::initConfiguration()
     // achieve this. For now...
 
     // *NOTE:Mani The command line parser parses tokens and is 
-    // setup to bail after parsing the '--url' option or the 
     // first option specified without a '--option' flag (or
     // any other option that uses the 'last_option' setting - 
     // see LLControlGroupCLP::configure())
@@ -1894,6 +1942,22 @@ bool LLAppViewer::initConfiguration()
         //              llerrs << "Failed to parse skin definition." << llendl;
         //      }
 
+        //      LLXmlTreeNode* rootp = skin_def_tree.getRoot();
+        //      LLXmlTreeNode* disabled_message_node = rootp->getChildByName("disabled_message");       
+        //      if (disabled_message_node)
+        //      {
+        //              gDisabledMessage = disabled_message_node->getContents();
+        //      }
+
+        //      static LLStdStringHandle hide_links_string = LLXmlTree::addAttributeString("hide_links");
+        //      rootp->getFastAttributeBOOL(hide_links_string, gHideLinks);
+
+        //      // Legacy string.  This flag really meant we didn't want to expose references to "Second Life".
+        //      // Just set gHideLinks instead.
+        //      static LLStdStringHandle silent_string = LLXmlTree::addAttributeString("silent_update");
+        //      BOOL silent_update;
+        //      rootp->getFastAttributeBOOL(silent_string, silent_update);
+        //      gHideLinks = (gHideLinks || silent_update);
         //}
 
 #if LL_DARWIN
@@ -2315,7 +2379,7 @@ void LLAppViewer::handleViewerCrash()
         gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
         gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
         gDebugInfo["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
-        gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
+//FIXME gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
         gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) getCurrentRSS() >> 10;
 
         if(gLogoutInProgress)
@@ -2542,28 +2606,55 @@ void LLAppViewer::removeMarkerFile(bool leave_logout_marker)
         }
 }
 
+
+//this gets called after we get a packet back from the
+//server saying we are logged out, or if the packet times
+//out
 void LLAppViewer::forceQuit()
 { 
+
+        LL_INFOS("forceQuit") << "Destroying the entire world" << LL_ENDL;
+        if (mQuitRequested)
         LLApp::setQuitting(); 
+        else
+        {
+                if (mLogoutRequested) //we just finished a logout request
+                {
+                        //LLStartUp::setStartupState( STATE_LOGIN_SHOW );
+                        LLStartUp::resetLogin();
+                        cleanup();
+                        mLogoutRequested=false;
+                        mLogoutRequestSent=false;
+                }
+        }
 }
 
-void LLAppViewer::requestQuit()
+void LLAppViewer::requestLogout(bool quit_after)
 {
-        llinfos << "requestQuit" << llendl;
+
+        mLogoutRequested=true;
+        if(quit_after)
+                mQuitRequested=true;
+        else
+                mQuitRequested=false;
+
+        llinfos << "requestLogout" << llendl;
 
         LLViewerRegion* region = gAgent.getRegion();
         
-        if( (LLStartUp::getStartupState() < STATE_STARTED) || !region )
+        if( (LLStartUp::getStartupState() >= STATE_STARTED) && region )
         {
-                // Quit immediately
-                forceQuit();
-                return;
-        }
-
         LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
         effectp->setPositionGlobal(gAgent.getPositionGlobal());
         effectp->setColor(LLColor4U(gAgent.getEffectColor()));
         LLHUDManager::getInstance()->sendEffects();
+                send_stats();
+        }
+        else
+        {
+                mQuitRequested=true;
+                LLAppViewer::instance()->forceQuit();
+        }
 
         // Attempt to close all floaters that might be
         // editing things.
@@ -2573,17 +2664,14 @@ void LLAppViewer::requestQuit()
                 gFloaterView->closeAllChildren(true);
         }
 
-        send_stats();
-
         gLogoutTimer.reset();
-        mQuitRequested = true;
 }
 
 static void finish_quit(S32 option, void *userdata)
 {
         if (option == 0)
         {
-                LLAppViewer::instance()->requestQuit();
+                LLAppViewer::instance()->requestLogout(true);
         }
 }
 
@@ -2592,6 +2680,12 @@ void LLAppViewer::userQuit()
         gViewerWindow->alertXml("ConfirmQuit", finish_quit, NULL);
 }
 
+//static
+void LLAppViewer::userLogout(void *userdata)
+{
+        LLAppViewer::instance()->requestLogout(false);
+}
+
 static void finish_early_exit(S32 option, void* userdata)
 {
         LLAppViewer::instance()->forceQuit();
@@ -2619,6 +2713,7 @@ void LLAppViewer::abortQuit()
 {
     llinfos << "abortQuit()" << llendl;
         mQuitRequested = false;
+        mLogoutRequested = false;
 }
 
 bool LLAppViewer::initCache()
@@ -2895,7 +2990,7 @@ void finish_forced_disconnect(S32 /* option */, void* /* userdata */)
 
 void LLAppViewer::forceDisconnect(const std::string& mesg)
 {
-        if (gDoDisconnect)
+        if (gDoDisconnect||mQuitRequested||mLogoutRequested)
     {
                 // Already popped up one of these dialogs, don't
                 // do this again.
@@ -3203,9 +3298,12 @@ void LLAppViewer::idle()
                 // Check for away from keyboard, kick idle agents.
                 idle_afk_check();
 
+                if (!gDisconnected) //check again
+                {
                 //  Update statistics for this frame
                 update_statistics(gFrameCount);
         }
+        }
 
         ////////////////////////////////////////
         //
@@ -3406,7 +3504,7 @@ void LLAppViewer::idle()
         // Handle shutdown process, for example, 
         // wait for floaters to close, send quit message,
         // forcibly quit if it has taken too long
-        if (mQuitRequested)
+        if (mQuitRequested || mLogoutRequested)
         {
                 idleShutdown();
         }
@@ -3506,12 +3604,12 @@ void LLAppViewer::sendLogoutRequest()
                 if (mLogoutMarkerFile)
                 {
                         llinfos << "Created logout marker file " << mLogoutMarkerFileName << llendl;
-                apr_file_close(mLogoutMarkerFile);
                 }
                 else
                 {
                         llwarns << "Cannot create logout marker file " << mLogoutMarkerFileName << llendl;
                 }
+                apr_file_close(mLogoutMarkerFile);
         }
 }
 
@@ -3528,6 +3626,9 @@ static F32 CheckMessagesMaxTime = CHECK_MESSAGES_DEFAULT_MAX_TIME;
 
 void LLAppViewer::idleNetwork()
 {
+        if (gDisconnected)
+                return;
+
         pingMainloopTimeout("idleNetwork");
 
         gObjectList.mNumNewObjects = 0;
@@ -3614,7 +3715,11 @@ void LLAppViewer::idleNetwork()
 
         gObjectList.mNumNewObjectsStat.addValue(gObjectList.mNumNewObjects);
 
+        if (gDisconnected)
+                return;
+
         // Retransmit unacknowledged packets.
+        if (gXferManager)
         gXferManager->retransmitUnackedPackets();
         gAssetStorage->checkForTimeouts();
 
@@ -3624,7 +3729,7 @@ void LLAppViewer::idleNetwork()
         // Check that the circuit between the viewer and the agent's current
         // region is still alive
         LLViewerRegion *agent_region = gAgent.getRegion();
-        if (agent_region)
+        if ((agent_region)&&(LLStartUp::getStartupState() == STATE_STARTED))
         {
                 LLUUID this_region_id = agent_region->getRegionID();
                 bool this_region_alive = agent_region->isAlive();
@@ -3644,6 +3749,9 @@ void LLAppViewer::disconnectViewer()
         {
                 return;
         }
+        
+        //set this true now, to prevent things from trying to access the network we are destroying
+        gDisconnected = TRUE;
         //
         // Cleanup after quitting.
         //      
@@ -3693,8 +3801,8 @@ void LLAppViewer::disconnectViewer()
         // Now we just ask the LLWorld singleton to cleanly shut down.
         LLWorld::getInstance()->destroyClass();
 
-        cleanup_xfer_manager();
-        gDisconnected = TRUE;
+        if (mQuitRequested)
+                cleanup_xfer_manager();
 }
 
 void LLAppViewer::forceErrorLLError()