diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-02 22:34:20 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-02 22:34:20 +0100 |
| commit | e0a1b46e6129a0e6ca62efe18882889db96c572f (patch) | |
| tree | d63f5d79302741627a7c3ae4e0de7cc1b1b22ad1 /indra/newview/llfloaterfixedenvironment.cpp | |
| parent | 3494fa3cfe50a0152ff9f66885a17e0adbaaf221 (diff) | |
| parent | 8d333a0176d56738154c75b1a24d694467647312 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.cpp')
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index ad4dcd567a..d35dd5ec98 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -490,7 +490,7 @@ void LLFloaterFixedEnvironment::doApplyEnvironment(const std::string &where) if (mInventoryItem && !isDirty()) { - LLEnvironment::instance().updateParcel(parcel->getLocalID(), mInventoryItem->getAssetUUID(), -1, -1); + LLEnvironment::instance().updateParcel(parcel->getLocalID(), mInventoryItem->getAssetUUID(), mInventoryItem->getName(), -1, -1); } else if (mSettings->getSettingsType() == "sky") { @@ -505,7 +505,7 @@ void LLFloaterFixedEnvironment::doApplyEnvironment(const std::string &where) { if (mInventoryItem && !isDirty()) { - LLEnvironment::instance().updateRegion(mInventoryItem->getAssetUUID(), -1, -1); + LLEnvironment::instance().updateRegion(mInventoryItem->getAssetUUID(), mInventoryItem->getName(), -1, -1); } else if (mSettings->getSettingsType() == "sky") { |