aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs5
-rw-r--r--prebuild.xml1
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 7b116ca..7daeba4 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -46,6 +46,7 @@ using OpenSim.Framework.Servers;
46using OpenSim.Framework.Servers.HttpServer; 46using OpenSim.Framework.Servers.HttpServer;
47using OpenSim.Region.Communications.OGS1; 47using OpenSim.Region.Communications.OGS1;
48using OpenSim.Region.Framework.Scenes; 48using OpenSim.Region.Framework.Scenes;
49using OpenSim.Services.Interfaces;
49// using OpenSim.Region.Environment.Modules.Framework; 50// using OpenSim.Region.Environment.Modules.Framework;
50 51
51namespace OpenSim.Region.Communications.Hypergrid 52namespace OpenSim.Region.Communications.Hypergrid
@@ -362,8 +363,10 @@ namespace OpenSim.Region.Communications.Hypergrid
362 info.RegionSettings.TerrainImageID = ass.FullID; 363 info.RegionSettings.TerrainImageID = ass.FullID;
363 ass.Type = (int)AssetType.Texture; 364 ass.Type = (int)AssetType.Texture;
364 ass.Temporary = false; 365 ass.Temporary = false;
366 ass.Local = true;
365 ass.Data = imageData; 367 ass.Data = imageData;
366 m_assetcache.AddAsset(ass); 368
369 m_sceneman.CurrentOrFirstScene.AssetService.Store(ass);
367 370
368 } 371 }
369 catch // LEGIT: Catching problems caused by OpenJPEG p/invoke 372 catch // LEGIT: Catching problems caused by OpenJPEG p/invoke
diff --git a/prebuild.xml b/prebuild.xml
index 102805d..45cc13d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1645,6 +1645,7 @@
1645 <Reference name="OpenSim.Region.Communications.Local"/> 1645 <Reference name="OpenSim.Region.Communications.Local"/>
1646 <Reference name="OpenSim.Region.Communications.OGS1"/> 1646 <Reference name="OpenSim.Region.Communications.OGS1"/>
1647 <Reference name="OpenSim.Region.Framework"/> 1647 <Reference name="OpenSim.Region.Framework"/>
1648 <Reference name="OpenSim.Services.Interfaces"/>
1648 <Reference name="OpenMetaverse.dll"/> 1649 <Reference name="OpenMetaverse.dll"/>
1649 <Reference name="OpenMetaverseTypes.dll"/> 1650 <Reference name="OpenMetaverseTypes.dll"/>
1650 <Reference name="XMLRPC.dll"/> 1651 <Reference name="XMLRPC.dll"/>