diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-11-02 09:17:19 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-11-02 09:17:19 -0700 |
| commit | 51772e6083d8af786704cee18f5eb3c9b3dfefda (patch) | |
| tree | 9c7fcda599da0773c4277519666cd8fe3f5a07eb /indra/newview/llfloaterfixedenvironment.cpp | |
| parent | e6b5ed3fefb1b5f0fca59075a20404a160b5116b (diff) | |
SL-9886: Viewer send and receive new day_name(s) information in the environment protocol for viewer specified names on individual tracks.
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") { |
