Merge in Storm-1838

This commit is contained in:
Inusaito Sayori
2013-07-31 15:49:34 -04:00
parent 9676eac3db
commit 04c78a1d8a
15 changed files with 314 additions and 50 deletions

View File

@@ -1394,6 +1394,7 @@ LLPanelAvatar::LLPanelAvatar(
factory_map["My Notes"] = LLCallbackMap(createPanelAvatarNotes, this);
mCommitCallbackRegistrar.add("Profile.Web", boost::bind(LLAvatarActions::showProfile, boost::bind(&LLPanelAvatar::getAvatarID, this), true));
mCommitCallbackRegistrar.add("Profile.TeleportRequest", boost::bind(LLAvatarActions::teleportRequest, boost::bind(&LLPanelAvatar::getAvatarID, this)));
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_avatar.xml", &factory_map);
selectTab(0);