diff options
Diffstat (limited to 'linden/indra/newview/llimpanel.h')
-rw-r--r-- | linden/indra/newview/llimpanel.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h index 5bac0bd..0f9c0f3 100644 --- a/linden/indra/newview/llimpanel.h +++ b/linden/indra/newview/llimpanel.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -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); |
@@ -295,8 +295,6 @@ private: | |||
295 | 295 | ||
296 | void sendTypingState(BOOL typing); | 296 | void sendTypingState(BOOL typing); |
297 | 297 | ||
298 | static LLFloaterIMPanel* sInstance; | ||
299 | |||
300 | private: | 298 | private: |
301 | LLLineEditor* mInputEditor; | 299 | LLLineEditor* mInputEditor; |
302 | LLViewerTextEditor* mHistoryEditor; | 300 | LLViewerTextEditor* mHistoryEditor; |