diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 18:29:17 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 18:29:17 -0400 |
commit | 3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (patch) | |
tree | 7cd7cef085a002885a362337fc8b67060bfcc395 /indra/newview/llsnapshotlivepreview.cpp | |
parent | 31d3d654f156351e3cf29f97fd97cbda046ae650 (diff) | |
parent | 959edebeca3c1d9f0730292c2f3bc0e8bb5bf94a (diff) |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/newview/llsnapshotlivepreview.cpp')
-rw-r--r-- | indra/newview/llsnapshotlivepreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp index 623565817d..0dd16ac55c 100644 --- a/indra/newview/llsnapshotlivepreview.cpp +++ b/indra/newview/llsnapshotlivepreview.cpp @@ -1032,7 +1032,7 @@ void LLSnapshotLivePreview::saveTexture() LLAgentUI::buildLocationString(pos_string, LLAgentUI::LOCATION_FORMAT_FULL); std::string who_took_it; LLAgentUI::buildFullname(who_took_it); - S32 expected_upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload(); + S32 expected_upload_cost = LLGlobalEconomy::getInstance()->getPriceUpload(); std::string name = "Snapshot: " + pos_string; std::string desc = "Taken by " + who_took_it + " at " + pos_string; |