diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-06-23 10:46:05 -0700 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-23 10:46:05 -0700 |
commit | 6c57abb295447f2b44eb833cb77fa718dc2b1118 (patch) | |
tree | 0d9e147ed0b6bbde05e7b9550386114a13416c10 /indra/newview/llinspectremoteobject.cpp | |
parent | 87082996e6408919591ee3d408918a4425494dc9 (diff) | |
parent | af914e4ab666aad041aa17f6459d1ff834440b44 (diff) |
Merged from q/viewer-release
Diffstat (limited to 'indra/newview/llinspectremoteobject.cpp')
-rw-r--r-- | indra/newview/llinspectremoteobject.cpp | 11 |
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() |