summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerkeyboard.cpp
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2012-05-31 16:37:22 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2012-05-31 16:37:22 +0300
commitbba0f4f74e56d911df8fc534d83cd4a84993bc8b (patch)
tree3c6c14b401c8c194e4383ae64816fe178cef87dc /indra/newview/llviewerkeyboard.cpp
parentfe252836ebfb8a1247b0ae3222056d0543203a44 (diff)
CHUI-119 WIP
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
-rw-r--r--indra/newview/llviewerkeyboard.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index 1aa9fd8a45..385d3cd29a 100644
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -31,7 +31,7 @@
#include "llmath.h"
#include "llagent.h"
#include "llagentcamera.h"
-#include "llnearbychatbar.h"
+#include "llnearbychat.h"
#include "llviewercontrol.h"
#include "llfocusmgr.h"
#include "llmorphview.h"
@@ -534,7 +534,7 @@ void stop_moving( EKeystate s )
void start_chat( EKeystate s )
{
// start chat
- LLNearbyChatBar::startChat(NULL);
+ LLNearbyChat::startChat(NULL);
}
void start_gesture( EKeystate s )
@@ -543,15 +543,15 @@ void start_gesture( EKeystate s )
if (KEYSTATE_UP == s &&
! (focus_ctrlp && focus_ctrlp->acceptsTextInput()))
{
- if (LLNearbyChatBar::getInstance()->getCurrentChat().empty())
+ if (LLNearbyChat::getInstance()->getCurrentChat().empty())
{
// No existing chat in chat editor, insert '/'
- LLNearbyChatBar::startChat("/");
+ LLNearbyChat::startChat("/");
}
else
{
// Don't overwrite existing text in chat editor
- LLNearbyChatBar::startChat(NULL);
+ LLNearbyChat::startChat(NULL);
}
}
}