diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-20 16:13:08 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-20 16:13:08 -0700 |
| commit | 13b781f4f67006e94e89262d32617fdac90dded4 (patch) | |
| tree | 38999c82745443078b296b19420a8bdd2069c930 /indra | |
| parent | bec60ef80e72ab6df8ae0bf6b7a7824e8504426a (diff) | |
| parent | d2b813fd79e4cf60d1670472c5a5f09ee9a2eed7 (diff) | |
merge in latest changes
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index bcad7adcce..450717e624 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -125,8 +125,6 @@ BOOL LLIMFloaterContainer::postBuild() addConversationListItem(LLUUID()); // manually add nearby chat - addConversationListItem(LLUUID()); // manually add nearby chat - mExpandCollapseBtn = getChild<LLButton>("expand_collapse_btn"); mExpandCollapseBtn->setClickedCallback(boost::bind(&LLIMFloaterContainer::onExpandCollapseButtonClicked, this)); |