aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authordiva2009-05-15 05:00:25 +0000
committerdiva2009-05-15 05:00:25 +0000
commit5e4fc6e91e5edffd1dc23af4f583d6294f394a3d (patch)
tree497076db68193be2d14fc3788c1d80c74d8c977d /OpenSim/Client
parentsome sculpted prim geometry accuracy and meshing speed improvements (diff)
downloadopensim-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 '')
-rw-r--r--OpenSim/Client/Linden/LLClientStackModule.cs2
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Client/Linden/LLClientStackModule.cs b/OpenSim/Client/Linden/LLClientStackModule.cs
index 4639db8..461c651 100644
--- a/OpenSim/Client/Linden/LLClientStackModule.cs
+++ b/OpenSim/Client/Linden/LLClientStackModule.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Client.Linden
83 m_clientServer 83 m_clientServer
84 = m_clientStackManager.CreateServer(endPoint.Address, 84 = m_clientStackManager.CreateServer(endPoint.Address,
85 ref port, m_scene.RegionInfo.ProxyOffset, m_scene.RegionInfo.m_allow_alternate_ports, m_source, 85 ref port, m_scene.RegionInfo.ProxyOffset, m_scene.RegionInfo.m_allow_alternate_ports, m_source,
86 m_scene.CommsManager.AssetCache, m_scene.AuthenticateHandler); 86 m_scene.AuthenticateHandler);
87 87
88 m_clientServer.AddScene(m_scene); 88 m_clientServer.AddScene(m_scene);
89 89
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 167d081..4218ad7 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
88 if (!UUID.TryParse(param, out assetID)) 88 if (!UUID.TryParse(param, out assetID))
89 return false; 89 return false;
90 90
91 AssetBase asset = m_scene.CommsManager.AssetCache.GetAsset(assetID, true); 91 AssetBase asset = m_scene.AssetService.Get(assetID.ToString());
92 92
93 if (asset == null) 93 if (asset == null)
94 return false; 94 return false;