aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-21 21:14:17 +0000
committerJustin Clarke Casey2009-01-21 21:14:17 +0000
commit37fa6775488ab237a4537d49b92a8d52b0497b98 (patch)
tree805183f2f807a8a051ba64878c079fb0a8c7fe17 /OpenSim/Framework
parent* Restore commented out isdone assertions in TextureSendTests.T010_SendPkg() (diff)
downloadopensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.zip
opensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.gz
opensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.bz2
opensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.xz
* refactor: Extract caps related code from scene and put into a region module
* No functional changes in this revision
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs2
-rw-r--r--OpenSim/Framework/IScene.cs4
2 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 6adf68c..a6acd68 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Framework.Communications.Capabilities
158 // the root of all evil 158 // the root of all evil
159 m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest); 159 m_capsHandlers["SEED"] = new RestStreamHandler("POST", capsBase + m_requestPath, CapsRequest);
160 m_log.DebugFormat( 160 m_log.DebugFormat(
161 "[CAPS]: Registering seed capability {0} for {1}", capsBase + m_requestPath, m_agentID); 161 "[CAPS]: Registered seed capability {0} for {1}", capsBase + m_requestPath, m_agentID);
162 162
163 //m_capsHandlers["MapLayer"] = 163 //m_capsHandlers["MapLayer"] =
164 // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST", 164 // new LLSDStreamhandler<OSDMapRequest, OSDMapLayerResponse>("POST",
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index d3c3843..ce74b46 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -86,10 +86,6 @@ namespace OpenSim.Framework
86 /// </exception> 86 /// </exception>
87 bool PresenceChildStatus(UUID agentId); 87 bool PresenceChildStatus(UUID agentId);
88 88
89 // Diva: get this out of here!!!
90 string GetCapsPath(UUID agentId);
91 Dictionary<ulong, string> GetChildrenSeeds(UUID agentId);
92
93 T RequestModuleInterface<T>(); 89 T RequestModuleInterface<T>();
94 T[] RequestModuleInterfaces<T>(); 90 T[] RequestModuleInterfaces<T>();
95 } 91 }