From b14e19c1ac1f329d75769ba8a9307608365ca06e Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 22 Jun 2010 15:46:17 +0300
Subject: EXT-7820 FIX escape only parameters of slurl

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/614/

--HG--
branch : product-engine
---
 indra/newview/llinspectremoteobject.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llinspectremoteobject.cpp')

diff --git a/indra/newview/llinspectremoteobject.cpp b/indra/newview/llinspectremoteobject.cpp
index 97ff771658..be021df363 100644
--- a/indra/newview/llinspectremoteobject.cpp
+++ b/indra/newview/llinspectremoteobject.cpp
@@ -128,7 +128,16 @@ void LLInspectRemoteObject::onOpen(const LLSD& data)
 	update();
 
 	// Position the inspector relative to the mouse cursor
-	LLUI::positionViewNearMouse(this);
+	// Similar to how tooltips are positioned
+	// See LLToolTipMgr::createToolTip
+	if (data.has("pos"))
+	{
+		LLUI::positionViewNearMouse(this, data["pos"]["x"].asInteger(), data["pos"]["y"].asInteger());
+	}
+	else
+	{
+		LLUI::positionViewNearMouse(this);
+	}
 }
 
 void LLInspectRemoteObject::onClickMap()
-- 
cgit v1.2.3