diff options
author | Jacek Antonelli | 2009-02-12 02:06:41 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-02-12 02:06:45 -0600 |
commit | 61f97b33f9850d21965d397b947a298c16ba576d (patch) | |
tree | a2edff0a7fbc83e2259eda952511b0fbdbea290b /linden/indra/newview/llimpanel.h | |
parent | Second Life viewer sources 1.22.7-RC (diff) | |
download | meta-impy-61f97b33f9850d21965d397b947a298c16ba576d.zip meta-impy-61f97b33f9850d21965d397b947a298c16ba576d.tar.gz meta-impy-61f97b33f9850d21965d397b947a298c16ba576d.tar.bz2 meta-impy-61f97b33f9850d21965d397b947a298c16ba576d.tar.xz |
Second Life viewer sources 1.22.8-RC
Diffstat (limited to 'linden/indra/newview/llimpanel.h')
-rw-r--r-- | linden/indra/newview/llimpanel.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h index bdddda4..3e22292 100644 --- a/linden/indra/newview/llimpanel.h +++ b/linden/indra/newview/llimpanel.h | |||
@@ -161,7 +161,7 @@ public: | |||
161 | /*virtual*/ void activate(); | 161 | /*virtual*/ void activate(); |
162 | /*virtual*/ void getChannelInfo(); | 162 | /*virtual*/ void getChannelInfo(); |
163 | 163 | ||
164 | void setSessionHandle(const std::string& handle); | 164 | void setSessionHandle(const std::string& handle, const std::string &inURI); |
165 | 165 | ||
166 | protected: | 166 | protected: |
167 | virtual void setState(EState state); | 167 | virtual void setState(EState state); |
@@ -294,8 +294,6 @@ private: | |||
294 | 294 | ||
295 | void sendTypingState(BOOL typing); | 295 | void sendTypingState(BOOL typing); |
296 | 296 | ||
297 | static LLFloaterIMPanel* sInstance; | ||
298 | |||
299 | private: | 297 | private: |
300 | LLLineEditor* mInputEditor; | 298 | LLLineEditor* mInputEditor; |
301 | LLViewerTextEditor* mHistoryEditor; | 299 | LLViewerTextEditor* mHistoryEditor; |