diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-04 09:14:58 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-04 09:14:58 -0500 |
commit | efa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (patch) | |
tree | 39a949e1570c3524c8560522b693328fc7d9afbf /indra/newview/llviewerwindowlistener.cpp | |
parent | eed7b7201188e01a452c7f4c511c0cb157dc7a5f (diff) | |
parent | 7549df0eaf347e9f490f9cfaf4950dd623a08237 (diff) |
merge up to viewer-development
Diffstat (limited to 'indra/newview/llviewerwindowlistener.cpp')
-rw-r--r-- | indra/newview/llviewerwindowlistener.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindowlistener.cpp b/indra/newview/llviewerwindowlistener.cpp index 4473b5820d..0b52948680 100644 --- a/indra/newview/llviewerwindowlistener.cpp +++ b/indra/newview/llviewerwindowlistener.cpp @@ -54,7 +54,7 @@ LLViewerWindowListener::LLViewerWindowListener(LLViewerWindow* llviewerwindow): // saveSnapshotArgs["type"] = LLSD::String(); add("saveSnapshot", "Save screenshot: [\"filename\"], [\"width\"], [\"height\"], [\"showui\"], [\"rebuild\"], [\"type\"]\n" - "type: \"COLOR\", \"DEPTH\", \"OBJECT_ID\"\n" + "type: \"COLOR\", \"DEPTH\"\n" "Post on [\"reply\"] an event containing [\"ok\"]", &LLViewerWindowListener::saveSnapshot, saveSnapshotArgs); @@ -71,7 +71,6 @@ void LLViewerWindowListener::saveSnapshot(const LLSD& event) const #define tp(name) types[#name] = LLViewerWindow::SNAPSHOT_TYPE_##name tp(COLOR); tp(DEPTH); - tp(OBJECT_ID); #undef tp // Our add() call should ensure that the incoming LLSD does in fact // contain our required arguments. Deal with the optional ones. |