aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2008-06-12 20:19:42 +0000
committerTeravus Ovares2008-06-12 20:19:42 +0000
commit5219eb74209d83f1a240a75528fad9d302b84f0e (patch)
treeb9cd1712b30bb348998482ef39d51c777c4e854e /OpenSim/Framework
parentFix mysql migrations. This is tested with an existing up to date schema, (diff)
downloadopensim-SC-5219eb74209d83f1a240a75528fad9d302b84f0e.zip
opensim-SC-5219eb74209d83f1a240a75528fad9d302b84f0e.tar.gz
opensim-SC-5219eb74209d83f1a240a75528fad9d302b84f0e.tar.bz2
opensim-SC-5219eb74209d83f1a240a75528fad9d302b84f0e.tar.xz
* Split the World Map code into a module.
* Implemented a hack so regions beyond the 10,000m range will show the map without having to click on the map before they'll start to show. The hack shows regions around the one you're in, but it won't show the one you're in.. you still need to click on the map to get that (not sure why yet). Additionally, the map still only shows pictures for regions that are hosted on the same instance (no change).
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index c2b0046..2bfcaca 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -135,10 +135,10 @@ namespace OpenSim.Framework.Communications.Capabilities
135 { 135 {
136 // the root of all evil 136 // the root of all evil
137 m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); 137 m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest);
138 m_capsHandlers["MapLayer"] = 138 //m_capsHandlers["MapLayer"] =
139 new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST", 139 // new LLSDStreamhandler<LLSDMapRequest, LLSDMapLayerResponse>("POST",
140 capsBase + m_mapLayerPath, 140 // capsBase + m_mapLayerPath,
141 GetMapLayer); 141 // GetMapLayer);
142 m_capsHandlers["NewFileAgentInventory"] = 142 m_capsHandlers["NewFileAgentInventory"] =
143 new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST", 143 new LLSDStreamhandler<LLSDAssetUploadRequest, LLSDAssetUploadResponse>("POST",
144 capsBase + m_newInventory, 144 capsBase + m_newInventory,
@@ -420,6 +420,7 @@ namespace OpenSim.Framework.Communications.Capabilities
420 mapLayer.Right = 5000; 420 mapLayer.Right = 5000;
421 mapLayer.Top = 5000; 421 mapLayer.Top = 5000;
422 mapLayer.ImageID = new LLUUID("00000000-0000-1111-9999-000000000006"); 422 mapLayer.ImageID = new LLUUID("00000000-0000-1111-9999-000000000006");
423
423 return mapLayer; 424 return mapLayer;
424 } 425 }
425 426