diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-31 00:30:07 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-08-31 00:30:49 +0300 |
| commit | d19d82712125b8a70056f2fa288cdd25205770a8 (patch) | |
| tree | ece789aa802dac877fc8fe8cb035894e3a4427a6 /indra/newview/llfloatervoicevolume.cpp | |
| parent | fbccc0986d6487c4490edee6e5793fcaeaf3415b (diff) | |
| parent | d31a83fb946c49a38376ea3b312b5380d0c8c065 (diff) | |
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*
Diffstat (limited to 'indra/newview/llfloatervoicevolume.cpp')
| -rw-r--r-- | indra/newview/llfloatervoicevolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatervoicevolume.cpp b/indra/newview/llfloatervoicevolume.cpp index 59e1f49f81..23f19dd5aa 100644 --- a/indra/newview/llfloatervoicevolume.cpp +++ b/indra/newview/llfloatervoicevolume.cpp @@ -127,7 +127,7 @@ void LLFloaterVoiceVolume::onOpen(const LLSD& data) // Extract appropriate avatar id mAvatarID = data["avatar_id"]; - LLUI::getInstance()->positionViewNearMouse(this); + LLInspect::repositionInspector(data); getChild<LLUICtrl>("avatar_name")->setValue(""); updateVolumeControls(); |