diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-23 09:21:52 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-23 09:21:52 +0100 |
| commit | af914e4ab666aad041aa17f6459d1ff834440b44 (patch) | |
| tree | 48584ccb08b80d120ec53f3d1df16df55cd9480b /indra/newview/llinspectremoteobject.cpp | |
| parent | 11ec720a063b73fc042e8b06338b9526835dbb6b (diff) | |
| parent | e02b51f125f876cfef10f504a121693b3612155a (diff) | |
merge from PE's 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() |