summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychatbar.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-03 16:28:58 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-03 16:28:58 +0300
commite2135bd6dd7668560f5b3af5e1a7549488caa2ab (patch)
treea033e2809d98ebea2fa74a5808c235276f5f5df2 /indra/newview/llnearbychatbar.cpp
parentb12201bf01caeef0f5a13951980be187ac3936c8 (diff)
parentd10b9a7f37bec670342136eeea2c8c2604fdfeef (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
-rw-r--r--indra/newview/llnearbychatbar.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index 8a52cf715f..6c1fb69c02 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -393,8 +393,6 @@ LLGestureComboList::~LLGestureComboList()
LLCtrlListInterface* LLGestureComboList::getListInterface()
{
- LLCtrlListInterface *result = mList;
- llassert((LLCtrlListInterface*)mList==result);
return mList;
};