Merge branch master (DRTVWR-483) into DRTVWR-559

# Conflicts:
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/lllocalbitmaps.h
#	indra/newview/llviewerregion.cpp
#            lllocalgltfmaterials.* were modified to match lllocalbitmaps*

1 files changed, 16 insertions, 0 deletions

diff --git a/indra/newview/llinspect.cpp b/indra/newview/llinspect.cpp
index 479e8f9abf..f382b5985f 100644
--- a/indra/newview/llinspect.cpp
+++ b/indra/newview/llinspect.cpp
@@ -147,3 +147,19 @@ bool LLInspect::childHasVisiblePopupMenu()
 	}
 	return false;
 }
+
+void LLInspect::repositionInspector(const LLSD& data)
+{
+	// Position the inspector relative to the mouse cursor
+	// Similar to how tooltips are positioned
+	// See LLToolTipMgr::createToolTip
+	if (data.has("pos"))
+	{
+		LLUI::getInstance()->positionViewNearMouse(this, data["pos"]["x"].asInteger(), data["pos"]["y"].asInteger());
+	}
+	else
+	{
+		LLUI::getInstance()->positionViewNearMouse(this);
+	}
+	applyRectControl();
+}