diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-12-09 20:58:20 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-12-09 20:58:20 -0800 |
| commit | 3e82ab0cc5c96e7c288ed3f93af7644a67a95afa (patch) | |
| tree | 7fd93dbf8a4538ab5ec09893172e6b355553d1be /indra | |
| parent | 45080fd7cbca8a19d21906a890c785282fff09fe (diff) | |
| parent | 519cf939d90e67acab808a63f5788e14c1d8bc8a (diff) | |
STORM-728 : Pull into viewer-development
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 1 | ||||
| -rw-r--r-- | indra/newview/llfloaterpostcard.cpp | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 402a0e85c4..ed67a87024 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12241,6 +12241,7 @@ <key>Value</key> <array> <string>snapshot</string> + <string>postcard</string> <string>mini_map</string> </array> </map> diff --git a/indra/newview/llfloaterpostcard.cpp b/indra/newview/llfloaterpostcard.cpp index f0c9d52ccd..054ab4538b 100644 --- a/indra/newview/llfloaterpostcard.cpp +++ b/indra/newview/llfloaterpostcard.cpp @@ -112,11 +112,14 @@ LLFloaterPostcard* LLFloaterPostcard::showFromSnapshot(LLImageJPEG *jpeg, LLView // Take the images from the caller // It's now our job to clean them up LLFloaterPostcard* instance = LLFloaterReg::showTypedInstance<LLFloaterPostcard>("postcard", LLSD(img->getID())); - - instance->mJPEGImage = jpeg; - instance->mViewerImage = img; - instance->mImageScale = image_scale; - instance->mPosTakenGlobal = pos_taken_global; + + if (instance) // may be 0 if we're in mouselook mode + { + instance->mJPEGImage = jpeg; + instance->mViewerImage = img; + instance->mImageScale = image_scale; + instance->mPosTakenGlobal = pos_taken_global; + } return instance; } |