diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:59:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-21 00:59:14 +0000 |
| commit | cef46d16453873691406c22be39ce0ee5e8076d1 (patch) | |
| tree | d7df442ce4af8e8001d7e7bf5647f116b35f929e /indra/newview/llbottomtray.cpp | |
| parent | 73a97010e6c8c7874fdc1778ab46e492f77d9394 (diff) | |
merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-1091 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index e37b660951..d84dd09812 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -47,7 +47,7 @@ #include "llselectmgr.h" #include "llvoavatarself.h" -S32 LLBottomTray::mLastSpecialChatChannel = 0; +S32 LLBottomTray::sLastSpecialChatChannel = 0; // legacy calllback glue void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel); @@ -412,16 +412,6 @@ void LLBottomTray::refreshStandUp() moveChildToBackOfTabGroup(mStandUpBtn); } } -void LLBottomTray::updateRightPosition(const S32 new_right_position) -{ - LLRect rc = getRect(); - if (new_right_position != rc.mRight) - { - rc.mRight = new_right_position; - reshape(rc.getWidth(), rc.getHeight(), FALSE); - setRect(rc); - } -} //FIXME: temporary, for stand up proto void LLBottomTray::onCommitStandUp(LLUICtrl* ctrl) @@ -624,7 +614,7 @@ LLWString LLBottomTray::stripChannelNumber(const LLWString &mesg, S32* channel) && mesg[1] == '/') { // This is a "repeat channel send" - *channel = mLastSpecialChatChannel; + *channel = sLastSpecialChatChannel; return mesg.substr(2, mesg.length() - 2); } else if (mesg[0] == '/' @@ -654,8 +644,8 @@ LLWString LLBottomTray::stripChannelNumber(const LLWString &mesg, S32* channel) pos++; } - mLastSpecialChatChannel = strtol(wstring_to_utf8str(channel_string).c_str(), NULL, 10); - *channel = mLastSpecialChatChannel; + sLastSpecialChatChannel = strtol(wstring_to_utf8str(channel_string).c_str(), NULL, 10); + *channel = sLastSpecialChatChannel; return mesg.substr(pos, mesg.length() - pos); } else |