diff options
author | diva | 2009-05-15 05:00:25 +0000 |
---|---|---|
committer | diva | 2009-05-15 05:00:25 +0000 |
commit | 5e4fc6e91e5edffd1dc23af4f583d6294f394a3d (patch) | |
tree | 497076db68193be2d14fc3788c1d80c74d8c977d /OpenSim/Region/Framework/Scenes/SceneManager.cs | |
parent | some sculpted prim geometry accuracy and meshing speed improvements (diff) | |
download | opensim-SC-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.zip opensim-SC-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.gz opensim-SC-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.bz2 opensim-SC-5e4fc6e91e5edffd1dc23af4f583d6294f394a3d.tar.xz |
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneManager.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 80634c0..e59675e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
@@ -649,7 +649,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
649 | { | 649 | { |
650 | for (int i=0;i<arrassets.Length;i++) | 650 | for (int i=0;i<arrassets.Length;i++) |
651 | { | 651 | { |
652 | AssetBase ab = sn.CommsManager.AssetCache.GetAsset(arrassets[i], true); | 652 | AssetBase ab = sn.AssetService.Get(arrassets[i].ToString()); |
653 | if (ab != null && ab.Data != null) | 653 | if (ab != null && ab.Data != null) |
654 | { | 654 | { |
655 | j2kdecode.syncdecode(arrassets[i], ab.Data); | 655 | j2kdecode.syncdecode(arrassets[i], ab.Data); |