summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-29 12:30:09 -0400
committerLoren Shih <seraph@lindenlab.com>2010-03-29 12:30:09 -0400
commitb6e7850c0a3d65ed0a1501e19a1655055000e32f (patch)
tree553d336a12691fb1c1caebc0e1979fc3567b02b7 /indra/newview/llviewerwindow.cpp
parent58d76a9ecf83b49e42fabfada27ca20814f93cf3 (diff)
parentb2a667b7222640a384cb23763b32f8746b0c8cd8 (diff)
Merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index f3ef4b38e9..85c961f34a 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2272,7 +2272,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
}
// Try for a new-format gesture
- if (LLGestureManager::instance().triggerGesture(key, mask))
+ if (LLGestureMgr::instance().triggerGesture(key, mask))
{
return TRUE;
}