EXT-1325 Texture Picker does not open

EXT-1264 'Zoom in' world context menu opens IM session
reviewed by Richard

1 files changed, 10 insertions, 4 deletions

diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp
index 4046c893c1..947e5d80da 100644
--- a/indra/newview/llinspectavatar.cpp
+++ b/indra/newview/llinspectavatar.cpp
@@ -109,10 +109,11 @@ private:
 	void onClickPay();
 	void onClickBlock();
 	void onClickReport();
+	void onClickZoomIn();  
+	void onClickFindOnMap();
 	bool onVisibleFindOnMap();
 	bool onVisibleGodMode();
 	void onClickMuteVolume();
-	void onFindOnMap();
 	void onVolumeChange(const LLSD& data);
 	
 	// Callback for gCacheName to look up avatar name
@@ -196,7 +197,8 @@ LLInspectAvatar::LLInspectAvatar(const LLSD& sd)
 	mCommitCallbackRegistrar.add("InspectAvatar.Pay",	boost::bind(&LLInspectAvatar::onClickPay, this));	
 	mCommitCallbackRegistrar.add("InspectAvatar.Block",	boost::bind(&LLInspectAvatar::onClickBlock, this));	
 	mCommitCallbackRegistrar.add("InspectAvatar.Report",	boost::bind(&LLInspectAvatar::onClickReport, this));	
-	mCommitCallbackRegistrar.add("InspectAvatar.FindOnMap",	boost::bind(&LLInspectAvatar::onFindOnMap, this));	
+	mCommitCallbackRegistrar.add("InspectAvatar.FindOnMap",	boost::bind(&LLInspectAvatar::onClickFindOnMap, this));	
+	mCommitCallbackRegistrar.add("InspectAvatar.ZoomIn", boost::bind(&LLInspectAvatar::onClickZoomIn, this));
 	mVisibleCallbackRegistrar.add("InspectAvatar.VisibleFindOnMap",	boost::bind(&LLInspectAvatar::onVisibleFindOnMap, this));	
 	mVisibleCallbackRegistrar.add("InspectAvatar.VisibleGodMode",	boost::bind(&LLInspectAvatar::onVisibleGodMode, this));	
 
@@ -476,7 +478,6 @@ void LLInspectAvatar::onClickViewProfile()
 	// hide inspector when showing profile
 	setFocus(FALSE);
 	LLAvatarActions::showProfile(mAvatarID);
-
 }
 
 bool LLInspectAvatar::onVisibleFindOnMap()
@@ -521,8 +522,13 @@ void LLInspectAvatar::onClickReport()
 	LLFloaterReporter::showFromObject(mAvatarID);
 }
 
+void LLInspectAvatar::onClickZoomIn() 
+{
+	handle_zoom_to_object(mAvatarID);
+	closeFloater();
+}
 
-void LLInspectAvatar::onFindOnMap()
+void LLInspectAvatar::onClickFindOnMap()
 {
 	gFloaterWorldMap->trackAvatar(mAvatarID, mAvatarName);
 	LLFloaterReg::showInstance("world_map");