diff options
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 9448a00e68..33c21b4061 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -352,7 +352,8 @@ class LLFileEnableCloseWindow : public view_listener_t { bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) { - bool new_value = gFloaterView->getFocusedFloater() != NULL || gSnapshotFloaterView->getFocusedFloater() != NULL; + bool new_value = NULL != LLFloater::getClosableFloaterFromFocus(); + // horrendously opaque, this code gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value); return true; @@ -937,6 +938,11 @@ 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 ) |