aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-30 21:14:50 -0700
committerMcCabe Maxsted2010-08-30 21:14:50 -0700
commit128a12f22fb053ebfa21fb7366a84543db1342ca (patch)
tree2d445cdcf76190a2292903616fb13006091a5341 /linden/indra
parentFixed bad merge in lltexteditor.cpp (diff)
downloadmeta-impy-128a12f22fb053ebfa21fb7366a84543db1342ca.zip
meta-impy-128a12f22fb053ebfa21fb7366a84543db1342ca.tar.gz
meta-impy-128a12f22fb053ebfa21fb7366a84543db1342ca.tar.bz2
meta-impy-128a12f22fb053ebfa21fb7366a84543db1342ca.tar.xz
Fixed linking error with chat as command line
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/floaterao.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/linden/indra/newview/floaterao.cpp b/linden/indra/newview/floaterao.cpp
index 4214e21..cfad0fb 100644
--- a/linden/indra/newview/floaterao.cpp
+++ b/linden/indra/newview/floaterao.cpp
@@ -19,8 +19,7 @@
19#include "llcheckboxctrl.h" 19#include "llcheckboxctrl.h"
20#include "llcombobox.h" 20#include "llcombobox.h"
21#include "llspinctrl.h" 21#include "llspinctrl.h"
22// Uncomment and use instead if we ever add the chatbar as a command line - MC 22#include "chatbar_as_cmdline.h"
23//#include "chatbar_as_cmdline.h"
24#include "llfloaterchat.h" 23#include "llfloaterchat.h"
25#include "llfirstuse.h" 24#include "llfirstuse.h"
26 25
@@ -35,15 +34,7 @@
35#include "llboost.h" 34#include "llboost.h"
36#include <boost/regex.hpp> 35#include <boost/regex.hpp>
37 36
38// Uncomment and use instead if we ever add the chatbar as a command line - MC 37void cmdline_printchat(std::string message);
39//void cmdline_printchat(std::string message);
40void cmdline_printchat(std::string message)
41{
42 LLChat chat;
43 chat.mText = message;
44 chat.mSourceType = CHAT_SOURCE_SYSTEM;
45 LLFloaterChat::addChat(chat, FALSE, FALSE);
46}
47 38
48AOInvTimer* gAOInvTimer = NULL; 39AOInvTimer* gAOInvTimer = NULL;
49 40