aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorMW2007-11-04 13:48:15 +0000
committerMW2007-11-04 13:48:15 +0000
commit039f2c46c057569463ba970f4b3f33990debf7e2 (patch)
treec73edc783228c43080a5a0878fd8f8b62af5b487 /OpenSim/Region/Environment/Modules
parentadd a IAssetProvider.CommitAssets() call to the grid asset server, when a ass... (diff)
downloadopensim-SC-039f2c46c057569463ba970f4b3f33990debf7e2.zip
opensim-SC-039f2c46c057569463ba970f4b3f33990debf7e2.tar.gz
opensim-SC-039f2c46c057569463ba970f4b3f33990debf7e2.tar.bz2
opensim-SC-039f2c46c057569463ba970f4b3f33990debf7e2.tar.xz
Added support for OpenSim application plugins (as requested by Adam), which use Mono.addins for loading/management. (which is a pure .net solution so works on both Mono and MS .net, and is under the MIT license, will add the source code for the library later). I also suggest we look into switching to using Mono.addins for our Region module loading management.
A little bit more refactoring of Scene.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/DynamicTextureModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
index 2bc3db8..2668812 100644
--- a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
+++ b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
@@ -177,7 +177,7 @@ namespace OpenSim.Region.Environment.Modules
177 asset.Description = "dynamic image"; 177 asset.Description = "dynamic image";
178 asset.Local = false; 178 asset.Local = false;
179 asset.Temporary = false; 179 asset.Temporary = false;
180 scene.commsManager.AssetCache.AddAsset(asset); 180 scene.AssetCache.AddAsset(asset);
181 181
182 LastAssetID = asset.FullID; 182 LastAssetID = asset.FullID;
183 183
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 5ba5941..98057f9 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Environment.Modules
128 AssetRequest request = new AssetRequest(client, e.RequestedAssetID, e.DiscardLevel, e.PacketNumber); 128 AssetRequest request = new AssetRequest(client, e.RequestedAssetID, e.DiscardLevel, e.PacketNumber);
129 ClientRequests[client.AgentId].Add(e.RequestedAssetID, request); 129 ClientRequests[client.AgentId].Add(e.RequestedAssetID, request);
130 } 130 }
131 m_scene.commsManager.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback); 131 m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback);
132 } 132 }
133 } 133 }
134 134