diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-23 10:55:32 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-23 10:55:32 -0700 |
| commit | 15909a45757252b98b4e8fdb098f08df1248ed4b (patch) | |
| tree | 5108f22422673308bbb705ad92becec254deee5c /indra/newview/llinspectremoteobject.cpp | |
| parent | f2bda4b2d75501815fddffac9b84ce0336bedab1 (diff) | |
| parent | 6c57abb295447f2b44eb833cb77fa718dc2b1118 (diff) | |
Merged from 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() |