summaryrefslogtreecommitdiff
path: root/indra/newview/llinspectremoteobject.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-06-22 15:46:17 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-06-22 15:46:17 +0300
commitb14e19c1ac1f329d75769ba8a9307608365ca06e (patch)
treeefd681bd667b5ea7e00cc7eff6f8474f871bc2d4 /indra/newview/llinspectremoteobject.cpp
parent632c287e9a03c3a447bdf1981a430cd4487b203b (diff)
EXT-7820 FIX escape only parameters of slurl
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/614/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinspectremoteobject.cpp')
-rw-r--r--indra/newview/llinspectremoteobject.cpp11
1 files changed, 10 insertions, 1 deletions
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()