aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llgesturemgr.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2009-04-30 13:04:20 -0500
committerJacek Antonelli2009-04-30 13:07:16 -0500
commitca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch)
tree8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llgesturemgr.cpp
parentSecond Life viewer sources 1.22.11 (diff)
downloadmeta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz
Second Life viewer sources 1.23.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llgesturemgr.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index a8e152c..2135ea5 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -17,7 +17,8 @@
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 20 * online at
21 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 22 *
22 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -952,9 +953,9 @@ void LLGestureManager::onLoadComplete(LLVFS *vfs,
952 && gGestureManager.mDeactivateSimilarNames.length() > 0) 953 && gGestureManager.mDeactivateSimilarNames.length() > 0)
953 { 954 {
954 // we're done with this set of deactivations 955 // we're done with this set of deactivations
955 LLStringUtil::format_map_t args; 956 LLSD args;
956 args["[NAMES]"] = gGestureManager.mDeactivateSimilarNames; 957 args["NAMES"] = gGestureManager.mDeactivateSimilarNames;
957 LLNotifyBox::showXml("DeactivatedGesturesTrigger", args); 958 LLNotifications::instance().add("DeactivatedGesturesTrigger", args);
958 } 959 }
959 } 960 }
960 961