diff options
author | Aaron Terrell (Enus) <enus@lindenlab.com> | 2010-08-30 11:56:33 -0700 |
---|---|---|
committer | Aaron Terrell (Enus) <enus@lindenlab.com> | 2010-08-30 11:56:33 -0700 |
commit | d04e8d757575dbb50877ef861adcfde427837bb6 (patch) | |
tree | b214237a4246e523754b356b003d1d2a163f21ab /indra/newview/llnearbychatbar.cpp | |
parent | 3172b4db1ee4d2059d2605ce616bdb10c840fc03 (diff) | |
parent | d84c6625c707b5d61b71749b74f3cc4fb8f02048 (diff) |
merging up from viewer-development
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
-rw-r--r-- | indra/newview/llnearbychatbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 9bef0a6192..4f9845d704 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -388,7 +388,7 @@ LLGestureComboList::~LLGestureComboList() LLCtrlListInterface* LLGestureComboList::getListInterface() { return mList; -}; +} LLNearbyChatBar::LLNearbyChatBar() : LLPanel() |