diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-04-09 00:09:12 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-04-09 00:09:12 -0600 |
| commit | c5756c3f0f024c7d95cd7766573f8191befc7427 (patch) | |
| tree | c009e000c799ebeb70db84058e273bb27b4feed5 /indra/newview/llviewermenufile.cpp | |
| parent | 09d488e20bed2f8c8397ca483e83bc59687fff87 (diff) | |
merged from viewer-trunk, fix for EXT-6780: to make LLImageBase::allocateData() thread-safe.
Also include some debug code for EXT-6567: crash at LLImageBase::allocateData().
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index dfde9a9d1d..a5bc5d0634 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -411,7 +411,6 @@ class LLFileTakeSnapshotToDisk : public view_listener_t { gViewerWindow->playSnapshotAnimAndSound(); - LLImageBase::setSizeOverride(TRUE); LLPointer<LLImageFormatted> formatted; switch(LLFloaterSnapshot::ESnapshotFormat(gSavedSettings.getS32("SnapshotFormat"))) { @@ -426,12 +425,12 @@ class LLFileTakeSnapshotToDisk : public view_listener_t break; default: llwarns << "Unknown Local Snapshot format" << llendl; - LLImageBase::setSizeOverride(FALSE); return true; } + formatted->enableOverSize() ; formatted->encode(raw, 0); - LLImageBase::setSizeOverride(FALSE); + formatted->disableOverSize() ; gViewerWindow->saveImageNumbered(formatted); } return true; |