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/llinventorybridge.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/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 3b6778892f..bc953f3ed1 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -6933,6 +6933,7 @@ void LLSettingsBridge::performAction(LLInventoryModel* model, std::string action if (!item) return; LLUUID asset_id = item->getAssetUUID(); + std::string name = item->getName(); LLParcel *parcel = LLViewerParcelMgr::instance().getAgentOrSelectedParcel(); if (!parcel) @@ -6943,7 +6944,7 @@ void LLSettingsBridge::performAction(LLInventoryModel* model, std::string action S32 parcel_id = parcel->getLocalID(); LL_WARNS("LAPRAS") << "Applying asset ID " << asset_id << " to parcel " << parcel_id << LL_ENDL; - LLEnvironment::instance().updateParcel(parcel_id, asset_id, -1, -1); + LLEnvironment::instance().updateParcel(parcel_id, asset_id, name, -1, -1); } else if ("apply_settings_region" == action) { @@ -6952,10 +6953,11 @@ void LLSettingsBridge::performAction(LLInventoryModel* model, std::string action if (!item) return; LLUUID asset_id = item->getAssetUUID(); + std::string name = item->getName(); LL_WARNS("LAPRAS") << "Applyng asset id " << asset_id << " to region." << LL_ENDL; - LLEnvironment::instance().updateRegion(asset_id, -1, -1); + LLEnvironment::instance().updateRegion(asset_id, name, -1, -1); } else LLItemBridge::performAction(model, action); |