diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-11-07 16:12:33 +0200 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-11-07 16:12:33 +0200 |
| commit | 7cd7875a17fdecf671b6a53fd6b78787d52d8655 (patch) | |
| tree | 6f8c8886e3f74702d28dc1fa2b12c307e8ab9c39 | |
| parent | 3b3b6c38a4afe3a061c54cc9fa9f8d7c65dcb990 (diff) | |
STORM-1688 FIXED The camera icon next to the "refresh snapshot" button is now always visible.
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_snapshot.xml | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index d25275f66b..4091b2e7bb 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -2451,7 +2451,8 @@ void LLFloaterSnapshot::preUpdate() LLFloaterSnapshot* instance = LLFloaterReg::findTypedInstance<LLFloaterSnapshot>("snapshot"); if (instance) { - instance->getChildView("refresh_icon")->setVisible(TRUE); // indicate refresh + // Disable the send/post/save buttons until snapshot is ready. + Impl::updateControls(instance); } } @@ -2462,7 +2463,8 @@ void LLFloaterSnapshot::postUpdate() LLFloaterSnapshot* instance = LLFloaterReg::findTypedInstance<LLFloaterSnapshot>("snapshot"); if (instance) { - instance->getChildView("refresh_icon")->setVisible(FALSE); + // Enable the send/post/save buttons. + Impl::updateControls(instance); } } diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 9719ee464e..d7a1510c1c 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -84,7 +84,6 @@ mouse_opaque="true" name="refresh_icon" top_delta="3" - visible="false" width="36" /> <button follows="left|top" |