diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-07-30 22:43:15 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-07-30 22:43:15 -0400 |
| commit | f423a69864c40f760c1c7e64a2e544fd1dba77fb (patch) | |
| tree | 13458119d53b5da6e15d407fad088c4a1228d05a | |
| parent | d1094573117db0a951a7e6159a352b0f4c8a8a24 (diff) | |
| parent | afaa076b7dd300a2836205fe6eb9ba5ab08bfb28 (diff) | |
Merge.
| -rw-r--r-- | indra/newview/llnearbychatbar.cpp | 2 |
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; }; |