diff options
author | Jacek Antonelli | 2009-07-30 13:54:51 -0500 |
---|---|---|
committer | Jacek Antonelli | 2010-07-02 22:57:22 -0500 |
commit | 0d8782e6a1dd76fbc1661d22f52d673cbed335bf (patch) | |
tree | 81513e66785523a5ad29a78ec6ec93e54916a556 /linden/indra | |
parent | add dbus method to retry joystick detection (diff) | |
download | meta-impy-0d8782e6a1dd76fbc1661d22f52d673cbed335bf.zip meta-impy-0d8782e6a1dd76fbc1661d22f52d673cbed335bf.tar.gz meta-impy-0d8782e6a1dd76fbc1661d22f52d673cbed335bf.tar.bz2 meta-impy-0d8782e6a1dd76fbc1661d22f52d673cbed335bf.tar.xz |
Added timestamps to the Script Warning/Error floater.
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/llfloaterscriptdebug.cpp | 3 | ||||
-rw-r--r-- | linden/indra/newview/llfloaterscriptdebug.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterscriptdebug.cpp b/linden/indra/newview/llfloaterscriptdebug.cpp index bc774e7..e6962d2 100644 --- a/linden/indra/newview/llfloaterscriptdebug.cpp +++ b/linden/indra/newview/llfloaterscriptdebug.cpp | |||
@@ -223,7 +223,8 @@ void LLFloaterScriptDebugOutput::addLine(const std::string &utf8mesg, const std: | |||
223 | setTitle(user_name); | 223 | setTitle(user_name); |
224 | } | 224 | } |
225 | 225 | ||
226 | mHistoryEditor->appendColoredText(utf8mesg, false, true, color); | 226 | mHistoryEditor->appendTime(true); |
227 | mHistoryEditor->appendColoredText(utf8mesg, false, false, color); | ||
227 | } | 228 | } |
228 | 229 | ||
229 | //static | 230 | //static |
diff --git a/linden/indra/newview/llfloaterscriptdebug.h b/linden/indra/newview/llfloaterscriptdebug.h index 59c0ba1..7c36c53 100644 --- a/linden/indra/newview/llfloaterscriptdebug.h +++ b/linden/indra/newview/llfloaterscriptdebug.h | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include "llfloater.h" | 36 | #include "llfloater.h" |
37 | 37 | ||
38 | class LLTextEditor; | 38 | class LLViewerTextEditor; |
39 | class LLUUID; | 39 | class LLUUID; |
40 | 40 | ||
41 | class LLFloaterScriptDebug : public LLMultiFloater | 41 | class LLFloaterScriptDebug : public LLMultiFloater |
@@ -73,7 +73,7 @@ public: | |||
73 | static LLFloaterScriptDebugOutput* getFloaterByID(const LLUUID& id); | 73 | static LLFloaterScriptDebugOutput* getFloaterByID(const LLUUID& id); |
74 | 74 | ||
75 | protected: | 75 | protected: |
76 | LLTextEditor* mHistoryEditor; | 76 | LLViewerTextEditor* mHistoryEditor; |
77 | 77 | ||
78 | typedef std::map<LLUUID, LLFloaterScriptDebugOutput*> instance_map_t; | 78 | typedef std::map<LLUUID, LLFloaterScriptDebugOutput*> instance_map_t; |
79 | static instance_map_t sInstanceMap; | 79 | static instance_map_t sInstanceMap; |