diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-27 12:43:48 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-27 12:43:48 -0700 |
| commit | 367e6557c61a0bed1258483c72ef0a462ebe9d06 (patch) | |
| tree | 807d8e04c63e03363235ab3e21c93b1cbaacf03c /indra/newview/llnearbychat.h | |
| parent | a686aeabffe619c9a467455982f1a39968fbd9e3 (diff) | |
| parent | cb699e3f2d64999e9817d0c4df5b7f9484e8e722 (diff) | |
merge with latest
Diffstat (limited to 'indra/newview/llnearbychat.h')
| -rw-r--r-- | indra/newview/llnearbychat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 2ea79797f8..834a31bbf0 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -1,4 +1,4 @@ -/** + /** * @file llnearbychat.h * @brief nearby chat history scrolling panel implementation * @@ -27,14 +27,14 @@ #ifndef LL_LLNEARBYCHAT_H_ #define LL_LLNEARBYCHAT_H_ -#include "lldockablefloater.h" #include "llscrollbar.h" #include "llviewerchat.h" +#include "llfloater.h" class LLResizeBar; class LLChatHistory; -class LLNearbyChat: public LLDockableFloater +class LLNearbyChat: public LLFloater { public: LLNearbyChat(const LLSD& key); |