aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorBrian McBee2007-11-25 22:27:42 +0000
committerBrian McBee2007-11-25 22:27:42 +0000
commitc710525b4801baeb1e1924b7cf735c5093edf499 (patch)
tree7957d4ebf72970590e7136afa5799e2172e9fce2 /OpenSim/Region
parentAdded new configuration item to User Server: X and Y of region to send user t... (diff)
downloadopensim-SC_OLD-c710525b4801baeb1e1924b7cf735c5093edf499.zip
opensim-SC_OLD-c710525b4801baeb1e1924b7cf735c5093edf499.tar.gz
opensim-SC_OLD-c710525b4801baeb1e1924b7cf735c5093edf499.tar.bz2
opensim-SC_OLD-c710525b4801baeb1e1924b7cf735c5093edf499.tar.xz
Added Region name to the terrain texture description that gets sent to the asset server
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index caff3bb..fd17d56 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -653,6 +653,7 @@ namespace OpenSim.Region.Environment.Scenes
653 asset.FullID = m_regInfo.EstateSettings.terrainImageID; 653 asset.FullID = m_regInfo.EstateSettings.terrainImageID;
654 asset.Data = data; 654 asset.Data = data;
655 asset.Name = "terrainImage"; 655 asset.Name = "terrainImage";
656 asset.Description = RegionInfo.RegionName;
656 asset.Type = 0; 657 asset.Type = 0;
657 asset.Temporary = true; 658 asset.Temporary = true;
658 AssetCache.AddAsset(asset); 659 AssetCache.AddAsset(asset);
@@ -667,6 +668,7 @@ namespace OpenSim.Region.Environment.Scenes
667 asset.FullID = m_regInfo.EstateSettings.terrainImageID; 668 asset.FullID = m_regInfo.EstateSettings.terrainImageID;
668 asset.Data = data; 669 asset.Data = data;
669 asset.Name = "terrainImage"; 670 asset.Name = "terrainImage";
671 asset.Description = RegionInfo.RegionName;
670 asset.Type = 0; 672 asset.Type = 0;
671 asset.Temporary = false; 673 asset.Temporary = false;
672 AssetCache.AddAsset(asset); 674 AssetCache.AddAsset(asset);