diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-02 18:17:51 +0200 |
commit | abb23ff31260e9632406dae03be920a23220d719 (patch) | |
tree | a24029245cf2ca511f3893e1b42e04ac3e9a90db /indra/newview/llfloatertestinspectors.cpp | |
parent | 9d8b189886ae14800d58f9729d8c8ea9b338ed52 (diff) | |
parent | f496c2b164a100836d74909c3e27adcdf98018f0 (diff) |
Manual merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloatertestinspectors.cpp')
-rw-r--r-- | indra/newview/llfloatertestinspectors.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatertestinspectors.cpp b/indra/newview/llfloatertestinspectors.cpp index 09996b0b92..58d5197eaa 100644 --- a/indra/newview/llfloatertestinspectors.cpp +++ b/indra/newview/llfloatertestinspectors.cpp @@ -82,12 +82,12 @@ void LLFloaterTestInspectors::showAvatarInspector(LLUICtrl*, const LLSD& avatar_ id = avatar_id.asUUID(); } // spawns off mouse position automatically - LLFloaterReg::showInstance("inspect_avatar", LLSD().insert("avatar_id", id)); + LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", id)); } void LLFloaterTestInspectors::showObjectInspector(LLUICtrl*, const LLSD& object_id) { - LLFloaterReg::showInstance("inspect_object", LLSD().insert("object_id", object_id)); + LLFloaterReg::showInstance("inspect_object", LLSD().with("object_id", object_id)); } void LLFloaterTestInspectors::onClickAvatar2D() |