diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-18 12:16:32 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-09-18 12:16:32 -0700 |
| commit | 80004efa6c99a9a3a6aff66b89a4921c9eadf412 (patch) | |
| tree | 17df9aa8644258ba09d7850fc03ee7fefbe01fa9 /indra/newview/llimfloatercontainer.cpp | |
| parent | 3c8407f32cf947ee1631ed66bba7a676e8b3b670 (diff) | |
| parent | 3fb222e939de7ef71630c5754d964fb81e08fce1 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llimfloatercontainer.cpp')
| -rwxr-xr-x | indra/newview/llimfloatercontainer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index db0d760e3f..4e0fba9502 100755 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -740,7 +740,6 @@ void LLIMFloaterContainer::addConversationListItem(const LLUUID& uuid) llwarns << "Couldn't create conversation session item : " << display_name << llendl; return; } - // *TODO: Should we flag LLConversationItemSession with a mIsNearbyChat? item->renameItem(display_name); mConversationsItems[uuid] = item; |