diff options
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llfloatermodelpreview.cpp | 1 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewertexture.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 54277b8557..007f6ee3ed 100644..100755 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -291,6 +291,7 @@ BOOL LLFloaterModelPreview::postBuild() //childSetLabelArg("ok_btn", "[AMOUNT]", llformat("%d",sUploadAmount)); childSetAction("ok_btn", onUpload, this); + childDisable("ok_btn"); childSetAction("clear_materials", onClearMaterials, this); diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index d655c52a17..092edafdbb 100644..100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -2719,6 +2719,9 @@ void LLViewerFetchedTexture::forceToSaveRawImage(S32 desired_discard, bool from_ } void LLViewerFetchedTexture::destroySavedRawImage() { + mForceToSaveRawImage = FALSE ; + mSaveRawImage = FALSE ; + clearCallbackEntryList() ; mSavedRawImage = NULL ; |