livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move getInstance() to instance()

ZiRee 2012-02-08 14:39:02 +01:00
parent f37ea05c2a
commit 1fad6a680d
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloaternearbychat.cpp
View File

@ -524,7 +524,7 @@ BOOL LLFloaterNearbyChat::handleKeyHere( KEY key, MASK mask )
if (handled == TRUE)
{
LLNearbyChat::getInstance()->sendChat(mInputEditor->getConvertedText(),type);
LLNearbyChat::instance().sendChat(mInputEditor->getConvertedText(),type);
}
return handled;

2
indra/newview/llgesturemgr.cpp
View File

@ -1012,7 +1012,7 @@ void LLGestureMgr::runStep(LLMultiGesture* gesture, LLGestureStep* step)
// <FS:Zi> Remove floating chat bar
// LLNearbyChatBar::getInstance()->sendChatFromViewer(chat_text, CHAT_TYPE_NORMAL, animate);
LLNearbyChat::getInstance()->sendChatFromViewer(chat_text, CHAT_TYPE_NORMAL, animate);
LLNearbyChat::instance().sendChatFromViewer(chat_text, CHAT_TYPE_NORMAL, animate);
// </FS:Zi>
gesture->mCurrentStep++;

2
indra/newview/llnearbychatbarlistener.cpp
View File

@ -104,7 +104,7 @@ void LLNearbyChatBarListener::sendChat(LLSD const & chat_data) const
// Send it as if it was typed in
// <FS:Zi> Remove floating chat bar
// mChatbar.sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0));
LLNearbyChat::getInstance()->sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0));
LLNearbyChat::instance().sendChatFromViewer(chat_to_send, type_o_chat, (BOOL)(channel == 0));
// <FS:Zi>
}

2
indra/newview/llnearbychatcontrol.cpp
View File

@ -100,7 +100,7 @@ LLNearbyChatControl::LLNearbyChatControl(const LLNearbyChatControl::Params& p) :
LLLineEditor(p)
{
setKeystrokeCallback(onKeystroke,this);
LLNearbyChat::getInstance()->registerChatBar(this);
LLNearbyChat::instance().registerChatBar(this);
setEnableLineHistory(TRUE);
setIgnoreArrowKeys( FALSE );

2
indra/newview/llviewergesture.cpp
View File

@ -135,7 +135,7 @@ void LLViewerGesture::doTrigger( BOOL send_chat )
// with the gesture animation.
// <FS:Zi> Remove floating chat bar
// LLNearbyChatBar::getInstance()->sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE);
LLNearbyChat::getInstance()->sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE);
LLNearbyChat::instance().sendChatFromViewer(mOutputString, CHAT_TYPE_NORMAL, FALSE);
}
}