Merge branch 'gridmanager' into next

1 files changed, 10 insertions, 5 deletions

diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index c998ba6..26b5086 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -462,6 +462,15 @@ class LLFileTakeSnapshotToDisk : public view_listener_t
         }
 };
 
+class FileLogout : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLAppViewer::userLogout(NULL);
+                return true;
+        }
+};
+
 class LLFileQuit : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -931,11 +940,6 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
                                                  LLAssetStorage::LLStoreAssetCallback callback,
                                                  void *userdata)
 {
-        if(gDisconnected)
-        {
-                return ;
-        }
-
         LLAssetID uuid = tid.makeAssetID(gAgent.getSecureSessionID());
         
         if( LLAssetType::AT_SOUND == asset_type )
@@ -1053,6 +1057,7 @@ void init_menu_file()
         (new LLFileSaveTexture())->registerListener(gMenuHolder, "File.SaveTexture");
         (new LLFileTakeSnapshot())->registerListener(gMenuHolder, "File.TakeSnapshot");
         (new LLFileTakeSnapshotToDisk())->registerListener(gMenuHolder, "File.TakeSnapshotToDisk");
+        (new FileLogout())->registerListener(gMenuHolder, "File.Logout");
         (new LLFileQuit())->registerListener(gMenuHolder, "File.Quit");
 
         (new LLFileEnableUpload())->registerListener(gMenuHolder, "File.EnableUpload");