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/llfloatermyenvironment.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/llfloatermyenvironment.cpp')
| -rw-r--r-- | indra/newview/llfloatermyenvironment.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloatermyenvironment.cpp b/indra/newview/llfloatermyenvironment.cpp index 6dcff7c264..c34ca9e458 100644 --- a/indra/newview/llfloatermyenvironment.cpp +++ b/indra/newview/llfloatermyenvironment.cpp @@ -320,10 +320,11 @@ void LLFloaterMyEnvironment::onDoApply(const std::string &context) if (itemp && itemp->getInventoryType() == LLInventoryType::IT_SETTINGS) { LLUUID asset_id = itemp->getAssetUUID(); + std::string name = itemp->getName(); if (context == PARAMETER_REGION) { - LLEnvironment::instance().updateRegion(asset_id, -1, -1); + LLEnvironment::instance().updateRegion(asset_id, name, -1, -1); } else if (context == PARAMETER_PARCEL) { @@ -333,7 +334,7 @@ void LLFloaterMyEnvironment::onDoApply(const std::string &context) LL_WARNS("ENVIRONMENT") << "Unable to determine parcel." << LL_ENDL; return; } - LLEnvironment::instance().updateParcel(parcel->getLocalID(), asset_id, -1, -1); + LLEnvironment::instance().updateParcel(parcel->getLocalID(), asset_id, name, -1, -1); } else if (context == PARAMETER_LOCAL) { |