diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:46:01 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:46:01 +0100 |
| commit | ff4d30edf4f89c078ccbffa8a3265cbf0f9c8815 (patch) | |
| tree | f07eba9f77b5a82bdf21a4b2ef81d5e308575604 /indra/newview | |
| parent | d5d3c852158b35ef65352f5b32dbff1aa9681f24 (diff) | |
| parent | bc0b401359763a2b408d352a32289f151c9a515a (diff) | |
merge backout.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index cfeaede832..aae379afe2 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1319,27 +1319,7 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp) // static void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater) { - LLSnapshotLivePreview* previewp = getPreviewView(floater); - if (NULL == previewp) - { - return; - } - - // Disable buttons until Snapshot is ready. EXT-6534 - BOOL got_snap = previewp->getSnapshotUpToDate(); - - // process Main buttons - floater->childSetEnabled("share", got_snap); - floater->childSetEnabled("save", got_snap); - floater->childSetEnabled("set_profile_pic", got_snap); - - // process Share actions buttons - floater->childSetEnabled("share_to_web", got_snap); - floater->childSetEnabled("share_to_email", got_snap); - // process Save actions buttons - floater->childSetEnabled("save_to_inventory", got_snap); - floater->childSetEnabled("save_to_computer", got_snap); } // static |