summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpeople.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-08-14 01:15:46 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-08-14 01:15:46 +0000
commit1db494f58ad378b8028c1f071196be82af5fe964 (patch)
treefd9cb0ab556ce32aaeca8e524f26cb46f60794e4 /indra/newview/llpanelpeople.cpp
parent61ae45fb80f5bccf0481659a4b16094f6c46047e (diff)
* Added a few safety checks to LLScrollContainer
* Minor change to LLIMView so that IM windows don't get hidden after they are displayed * Changed default action for avatar list to be IM as per spec * Fixed merge of home tab from avatar code.
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
-rw-r--r--indra/newview/llpanelpeople.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index a8e3fd3195..630970fcf5 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -651,10 +651,14 @@ void LLPanelPeople::onAvatarListDoubleClicked(LLAvatarList* list)
if (clicked_id.isNull())
return;
-
+
+#if 0 // SJB: Useful for testing, but not currently functional or to spec
// Open mini-inspector for the avatar being clicked
LLFloaterReg::showInstance("mini_inspector", clicked_id);
// inspector will delete itself on close
+#else // spec says open IM window
+ LLAvatarActions::startIM(clicked_id);
+#endif
}
void LLPanelPeople::onAvatarListCommitted(LLAvatarList* list)