diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/lggautocorrectfloater.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/lggautocorrectfloater.cpp b/linden/indra/newview/lggautocorrectfloater.cpp index 9d68b25..1690eaf 100644 --- a/linden/indra/newview/lggautocorrectfloater.cpp +++ b/linden/indra/newview/lggautocorrectfloater.cpp | |||
@@ -49,6 +49,7 @@ | |||
49 | #include "llcheckboxctrl.h" | 49 | #include "llcheckboxctrl.h" |
50 | #include "llviewercontrol.h" | 50 | #include "llviewercontrol.h" |
51 | 51 | ||
52 | #include "floaterbusy.h" // InvDropTarget | ||
52 | #include "llui.h" | 53 | #include "llui.h" |
53 | #include "llcontrol.h" | 54 | #include "llcontrol.h" |
54 | #include "llscrolllistctrl.h" | 55 | #include "llscrolllistctrl.h" |
@@ -89,7 +90,7 @@ public: | |||
89 | LLPrefsAdvanced * empanel; | 90 | LLPrefsAdvanced * empanel; |
90 | private: | 91 | private: |
91 | static lggAutoCorrectFloater* sInstance; | 92 | static lggAutoCorrectFloater* sInstance; |
92 | static JCInvDropTarget* mNotecardDropTarget; | 93 | static InvDropTarget* mNotecardDropTarget; |
93 | static void onBoxCommitEnabled(LLUICtrl* caller, void* user_data); | 94 | static void onBoxCommitEnabled(LLUICtrl* caller, void* user_data); |
94 | static void onEntrySettingChange(LLUICtrl* caller, void* user_data); | 95 | static void onEntrySettingChange(LLUICtrl* caller, void* user_data); |
95 | static void onSelectName(LLUICtrl* caller, void* user_data); | 96 | static void onSelectName(LLUICtrl* caller, void* user_data); |
@@ -107,7 +108,7 @@ private: | |||
107 | 108 | ||
108 | 109 | ||
109 | 110 | ||
110 | JCInvDropTarget * lggAutoCorrectFloater::mNotecardDropTarget; | 111 | InvDropTarget * lggAutoCorrectFloater::mNotecardDropTarget; |
111 | lggAutoCorrectFloater* lggAutoCorrectFloater::sInstance; | 112 | lggAutoCorrectFloater* lggAutoCorrectFloater::sInstance; |
112 | 113 | ||
113 | lggAutoCorrectFloater::~lggAutoCorrectFloater() | 114 | lggAutoCorrectFloater::~lggAutoCorrectFloater() |
@@ -165,7 +166,7 @@ BOOL lggAutoCorrectFloater::postBuild(void) | |||
165 | { | 166 | { |
166 | delete mNotecardDropTarget; | 167 | delete mNotecardDropTarget; |
167 | } | 168 | } |
168 | mNotecardDropTarget = new JCInvDropTarget("drop target", target_view->getRect(), ResponseItemDrop);//, mAvatarID); | 169 | mNotecardDropTarget = new InvDropTarget("drop target", target_view->getRect(), ResponseItemDrop);//, mAvatarID); |
169 | addChild(mNotecardDropTarget); | 170 | addChild(mNotecardDropTarget); |
170 | } | 171 | } |
171 | return true; | 172 | return true; |
@@ -429,7 +430,7 @@ void lggAutoCorrectFloater::addEntry(void* data) | |||
429 | { | 430 | { |
430 | std::string listName= sInstance->namesList->getFirstSelected()->getColumn(0)->getValue().asString(); | 431 | std::string listName= sInstance->namesList->getFirstSelected()->getColumn(0)->getValue().asString(); |
431 | LLChat chat; | 432 | LLChat chat; |
432 | chat.mText = "To add an entry, please type in chat \""+gSavedSettings.getString("EmeraldCmdLineAutocorrect")+" "+listName+"|wrongWord|rightWord\""; | 433 | chat.mText = "To add an entry, please type in chat \""+gSavedSettings.getString("CmdLineChatbarAutocorrect")+" "+listName+"|wrongWord|rightWord\""; |
433 | chat.mSourceType = CHAT_SOURCE_SYSTEM; | 434 | chat.mSourceType = CHAT_SOURCE_SYSTEM; |
434 | LLFloaterChat::addChat(chat, FALSE, FALSE); | 435 | LLFloaterChat::addChat(chat, FALSE, FALSE); |
435 | } | 436 | } |