aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2011-06-13 07:56:52 -0700
committerDiva Canto2011-06-13 07:56:52 -0700
commit0e4db3ca3911d8ac7080f51931ffe71b388e7180 (patch)
treec91012c1c78cffd93b8feeee9fc4502632d23f22
parentAdd credit and link to SimianGrid project. Thanks, guys! (diff)
downloadopensim-SC_OLD-0e4db3ca3911d8ac7080f51931ffe71b388e7180.zip
opensim-SC_OLD-0e4db3ca3911d8ac7080f51931ffe71b388e7180.tar.gz
opensim-SC_OLD-0e4db3ca3911d8ac7080f51931ffe71b388e7180.tar.bz2
opensim-SC_OLD-0e4db3ca3911d8ac7080f51931ffe71b388e7180.tar.xz
Added experimental new capability URL called MapImageService meant to work with Kokua viewer if devs are willing to do it.
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs119
-rw-r--r--bin/OpenSim.ini.example5
2 files changed, 124 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
new file mode 100644
index 0000000..d084a73
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
@@ -0,0 +1,119 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections;
30using System.Reflection;
31using log4net;
32using Nini.Config;
33using Mono.Addins;
34using OpenMetaverse;
35using OpenSim.Framework;
36using OpenSim.Framework.Servers.HttpServer;
37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Services.Interfaces;
40using Caps = OpenSim.Framework.Capabilities.Caps;
41using OpenSim.Capabilities.Handlers;
42
43namespace OpenSim.Region.ClientStack.Linden
44{
45 /// <summary>
46 /// A module to place miscellaneous capabilities
47 /// </summary>
48 ///
49 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
50 public class MiscCapsModule : INonSharedRegionModule
51 {
52 private static readonly ILog m_log =
53 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
54 private Scene m_scene;
55
56 private bool m_Enabled = false;
57 private string m_MapImageServerURL;
58
59 #region ISharedRegionModule Members
60
61 public void Initialise(IConfigSource source)
62 {
63 m_Enabled = true;
64 IConfig config = source.Configs["ClientStack.LindenCaps"];
65 if (config == null)
66 return;
67
68 m_MapImageServerURL = config.GetString("Cap_MapImageService", string.Empty);
69 }
70
71 public void AddRegion(Scene s)
72 {
73 if (!m_Enabled)
74 return;
75
76 m_scene = s;
77 }
78
79 public void RemoveRegion(Scene s)
80 {
81 if (!m_Enabled)
82 return;
83
84 m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
85 m_scene = null;
86 }
87
88 public void RegionLoaded(Scene s)
89 {
90 if (!m_Enabled)
91 return;
92
93 m_scene.EventManager.OnRegisterCaps += RegisterCaps;
94 }
95
96 public void PostInitialise()
97 {
98 }
99
100 public void Close() { }
101
102 public string Name { get { return "MiscCapsModule"; } }
103
104 public Type ReplaceableInterface
105 {
106 get { return null; }
107 }
108
109 #endregion
110
111 public void RegisterCaps(UUID agentID, Caps caps)
112 {
113 m_log.InfoFormat("[MISC CAPS MODULE]: {0} in region {1}", m_MapImageServerURL, m_scene.RegionInfo.RegionName);
114 if (m_MapImageServerURL != string.Empty)
115 caps.RegisterHandler("MapImageService", m_MapImageServerURL);
116 }
117
118 }
119}
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 813c5b8..a9ce284 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -306,6 +306,11 @@
306 ; This is disabled by default. Change if you see fit. Note that 306 ; This is disabled by default. Change if you see fit. Note that
307 ; serving this cap from the simulators may lead to poor performace. 307 ; serving this cap from the simulators may lead to poor performace.
308 Cap_WebFetchInventoryDescendents = "" 308 Cap_WebFetchInventoryDescendents = ""
309 ; Experimental new capability for Kokua viewers meant to override
310 ; the MapImage server url given at login, and varying switching on
311 ; a sim-basis (as it should).
312 ; Viewers that don't understand it, will ignore it
313 Cap_MapImageService = "http://127.0.0.1:9000/
309 314
310[Chat] 315[Chat]
311 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10 316 ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10