diff options
author | Rider Linden <rider@lindenlab.com> | 2016-08-17 12:42:14 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-08-17 12:42:14 -0700 |
commit | d258fe40353642b20524ef320b70e6b9bf0f8ec4 (patch) | |
tree | 40918499d2a59dcbbac51f7d24930c174537fe27 /indra/newview/llfloatersnapshot.cpp | |
parent | 1edf48a0c763dee0f5d274ede6ab82d8d9b30246 (diff) | |
parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) |
Merge
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
-rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index afec981d56..b906671c7f 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1418,6 +1418,20 @@ void LLFloaterSnapshot::postPanelSwitch() } // static +void LLFloaterSnapshot::inventorySaveFailed() +{ + LLFloaterSnapshot* instance = findInstance(); + if (!instance) + { + llassert(instance != NULL); + return; + } + + instance->impl.updateControls(instance); + instance->impl.setStatus(Impl::STATUS_FINISHED, false, "inventory"); +} + +// static LLPointer<LLImageFormatted> LLFloaterSnapshot::getImageData() { // FIXME: May not work for textures. |