diff options
author | Melanie | 2011-06-13 12:38:17 +0100 |
---|---|---|
committer | Melanie | 2011-06-13 12:38:17 +0100 |
commit | 9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f (patch) | |
tree | 737d2847e8ea312e18ab96df2e2f6728e068381c | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | match water color for warp3d map tiler and adjust lighting (diff) | |
download | opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.zip opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.gz opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.bz2 opensim-SC_OLD-9b1d3f0c38a79b96ab3bac72c04cfc397b0a499f.tar.xz |
Merge branch 'master' into careminster-presence-refactor
18 files changed, 1050 insertions, 27 deletions
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations index 7848e49..55d82ec 100644 --- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations +++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations | |||
@@ -25,8 +25,8 @@ COMMIT; | |||
25 | 25 | ||
26 | BEGIN; | 26 | BEGIN; |
27 | 27 | ||
28 | ALTER TABLE `Friends` MODIFY COLUMN PrincipalID varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; | ||
28 | ALTER TABLE `Friends` DROP PRIMARY KEY; | 29 | ALTER TABLE `Friends` DROP PRIMARY KEY; |
29 | ALTER TABLE `Friends` ADD PRIMARY KEY(PrincipalID(36), Friend(36)); | 30 | ALTER TABLE `Friends` ADD PRIMARY KEY(PrincipalID(36), Friend(36)); |
30 | ALTER TABLE `Friends` MODIFY COLUMN PrincipalID varchar(255) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000'; | ||
31 | 31 | ||
32 | COMMIT; | 32 | COMMIT; |
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index c12d666..460f759 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -412,7 +412,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
412 | // OpenSim.Framework.WebUtil.OSHeaderRequestID | 412 | // OpenSim.Framework.WebUtil.OSHeaderRequestID |
413 | if (request.Headers["opensim-request-id"] != null) | 413 | if (request.Headers["opensim-request-id"] != null) |
414 | reqnum = String.Format("{0}:{1}",request.RemoteIPEndPoint,request.Headers["opensim-request-id"]); | 414 | reqnum = String.Format("{0}:{1}",request.RemoteIPEndPoint,request.Headers["opensim-request-id"]); |
415 | // m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl); | 415 | //m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl); |
416 | 416 | ||
417 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); | 417 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); |
418 | 418 | ||
@@ -440,7 +440,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
440 | string path = request.RawUrl; | 440 | string path = request.RawUrl; |
441 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 441 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
442 | 442 | ||
443 | // m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | 443 | //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); |
444 | 444 | ||
445 | if (TryGetStreamHandler(handlerKey, out requestHandler)) | 445 | if (TryGetStreamHandler(handlerKey, out requestHandler)) |
446 | { | 446 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs index 40506a5..dda67f9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | |||
@@ -280,11 +280,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
280 | List<string> ids = new List<string>(); | 280 | List<string> ids = new List<string>(); |
281 | foreach (FriendInfo f in kvp.Value) | 281 | foreach (FriendInfo f in kvp.Value) |
282 | ids.Add(f.Friend); | 282 | ids.Add(f.Friend); |
283 | UserAgentServiceConnector uConn = new UserAgentServiceConnector(kvp.Key, false); | 283 | UserAgentServiceConnector uConn = new UserAgentServiceConnector(kvp.Key); |
284 | List<UUID> friendsOnline = uConn.StatusNotification(ids, userID, online); | 284 | List<UUID> friendsOnline = uConn.StatusNotification(ids, userID, online); |
285 | Thread.Sleep(100); | 285 | |
286 | // need to debug this here | 286 | if (online && friendsOnline.Count > 0) |
287 | if (online) | ||
288 | { | 287 | { |
289 | IClientAPI client = LocateClientObject(userID); | 288 | IClientAPI client = LocateClientObject(userID); |
290 | if (client != null) | 289 | if (client != null) |
@@ -305,15 +304,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
305 | if (Util.ParseUniversalUserIdentifier(fid, out agentID, out url, out first, out last, out tmp)) | 304 | if (Util.ParseUniversalUserIdentifier(fid, out agentID, out url, out first, out last, out tmp)) |
306 | { | 305 | { |
307 | IUserManagement userMan = m_Scenes[0].RequestModuleInterface<IUserManagement>(); | 306 | IUserManagement userMan = m_Scenes[0].RequestModuleInterface<IUserManagement>(); |
308 | userMan.AddUser(agentID, url + ";" + first + " " + last); | 307 | userMan.AddUser(agentID, first, last, url); |
309 | 308 | ||
310 | try // our best | ||
311 | { | ||
312 | string[] parts = userMan.GetUserName(agentID).Split(); | ||
313 | first = parts[0]; | ||
314 | last = parts[1]; | ||
315 | } | ||
316 | catch { } | ||
317 | return true; | 309 | return true; |
318 | } | 310 | } |
319 | return false; | 311 | return false; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs new file mode 100644 index 0000000..b570155 --- /dev/null +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/MapImage/MapImageServiceInConnectorModule.cs | |||
@@ -0,0 +1,111 @@ | |||
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 | |||
28 | using System; | ||
29 | using System.Reflection; | ||
30 | using System.Collections.Generic; | ||
31 | using log4net; | ||
32 | using Mono.Addins; | ||
33 | using Nini.Config; | ||
34 | using OpenSim.Framework; | ||
35 | using OpenSim.Region.Framework.Scenes; | ||
36 | using OpenSim.Region.Framework.Interfaces; | ||
37 | using OpenSim.Server.Base; | ||
38 | using OpenSim.Server.Handlers.Base; | ||
39 | using OpenSim.Server.Handlers.MapImage; | ||
40 | using OpenSim.Services.Interfaces; | ||
41 | |||
42 | namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.MapImage | ||
43 | { | ||
44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
45 | public class MapImageServiceInConnectorModule : ISharedRegionModule | ||
46 | { | ||
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
48 | private static bool m_Enabled = false; | ||
49 | |||
50 | private IConfigSource m_Config; | ||
51 | bool m_Registered = false; | ||
52 | |||
53 | #region IRegionModule interface | ||
54 | |||
55 | public void Initialise(IConfigSource config) | ||
56 | { | ||
57 | m_Config = config; | ||
58 | IConfig moduleConfig = config.Configs["Modules"]; | ||
59 | if (moduleConfig != null) | ||
60 | { | ||
61 | m_Enabled = moduleConfig.GetBoolean("MapImageServiceInConnector", false); | ||
62 | if (m_Enabled) | ||
63 | { | ||
64 | m_log.Info("[MAP SERVICE IN CONNECTOR]: MapImage Service In Connector enabled"); | ||
65 | new MapGetServiceConnector(m_Config, MainServer.Instance, "MapImageService"); | ||
66 | } | ||
67 | |||
68 | } | ||
69 | |||
70 | } | ||
71 | |||
72 | public void PostInitialise() | ||
73 | { | ||
74 | } | ||
75 | |||
76 | public void Close() | ||
77 | { | ||
78 | } | ||
79 | |||
80 | public Type ReplaceableInterface | ||
81 | { | ||
82 | get { return null; } | ||
83 | } | ||
84 | |||
85 | public string Name | ||
86 | { | ||
87 | get { return "MapImageServiceIn"; } | ||
88 | } | ||
89 | |||
90 | public void AddRegion(Scene scene) | ||
91 | { | ||
92 | if (!m_Enabled) | ||
93 | return; | ||
94 | } | ||
95 | |||
96 | public void RemoveRegion(Scene scene) | ||
97 | { | ||
98 | if (!m_Enabled) | ||
99 | return; | ||
100 | } | ||
101 | |||
102 | public void RegionLoaded(Scene scene) | ||
103 | { | ||
104 | if (!m_Enabled) | ||
105 | return; | ||
106 | } | ||
107 | |||
108 | #endregion | ||
109 | |||
110 | } | ||
111 | } | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs new file mode 100644 index 0000000..ee90859 --- /dev/null +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs | |||
@@ -0,0 +1,232 @@ | |||
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 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Reflection; | ||
31 | using System.Net; | ||
32 | using System.IO; | ||
33 | using System.Timers; | ||
34 | using System.Drawing; | ||
35 | using System.Drawing.Imaging; | ||
36 | |||
37 | using log4net; | ||
38 | using Mono.Addins; | ||
39 | using Nini.Config; | ||
40 | using OpenSim.Framework; | ||
41 | using OpenSim.Region.Framework.Interfaces; | ||
42 | using OpenSim.Region.Framework.Scenes; | ||
43 | using OpenSim.Services.Interfaces; | ||
44 | using OpenSim.Server.Base; | ||
45 | using OpenMetaverse; | ||
46 | using OpenMetaverse.StructuredData; | ||
47 | |||
48 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage | ||
49 | { | ||
50 | /// <summary> | ||
51 | /// </summary> | ||
52 | /// <remarks> | ||
53 | /// </remarks> | ||
54 | |||
55 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
56 | public class MapImageServiceModule : ISharedRegionModule | ||
57 | { | ||
58 | private static readonly ILog m_log = | ||
59 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
60 | |||
61 | private bool m_enabled = false; | ||
62 | private IMapImageService m_MapService; | ||
63 | |||
64 | private string m_serverUrl = String.Empty; | ||
65 | private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); | ||
66 | |||
67 | private int m_refreshtime = 0; | ||
68 | private int m_lastrefresh = 0; | ||
69 | private System.Timers.Timer m_refreshTimer = new System.Timers.Timer(); | ||
70 | |||
71 | #region ISharedRegionModule | ||
72 | |||
73 | public Type ReplaceableInterface { get { return null; } } | ||
74 | public string Name { get { return "MapImageServiceModule"; } } | ||
75 | public void RegionLoaded(Scene scene) { } | ||
76 | public void Close() { } | ||
77 | public void PostInitialise() { } | ||
78 | |||
79 | |||
80 | ///<summary> | ||
81 | /// | ||
82 | ///</summary> | ||
83 | public void Initialise(IConfigSource source) | ||
84 | { | ||
85 | IConfig moduleConfig = source.Configs["Modules"]; | ||
86 | if (moduleConfig != null) | ||
87 | { | ||
88 | string name = moduleConfig.GetString("MapImageService", ""); | ||
89 | if (name != Name) | ||
90 | return; | ||
91 | } | ||
92 | |||
93 | IConfig config = source.Configs["MapImageService"]; | ||
94 | if (config == null) | ||
95 | return; | ||
96 | |||
97 | int refreshminutes = Convert.ToInt32(config.GetString("RefreshTime")); | ||
98 | if (refreshminutes <= 0) | ||
99 | { | ||
100 | m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: No refresh time given in config. Module disabled."); | ||
101 | return; | ||
102 | } | ||
103 | |||
104 | m_refreshtime = refreshminutes * 60 * 1000; // convert from minutes to ms | ||
105 | |||
106 | string service = config.GetString("LocalServiceModule", string.Empty); | ||
107 | if (service == string.Empty) | ||
108 | { | ||
109 | m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: No service dll given in config. Unable to proceed."); | ||
110 | return; | ||
111 | } | ||
112 | |||
113 | Object[] args = new Object[] { source }; | ||
114 | m_MapService = ServerUtils.LoadPlugin<IMapImageService>(service, args); | ||
115 | |||
116 | m_refreshTimer.Enabled = true; | ||
117 | m_refreshTimer.AutoReset = true; | ||
118 | m_refreshTimer.Interval = m_refreshtime; | ||
119 | m_refreshTimer.Elapsed += new ElapsedEventHandler(HandleMaptileRefresh); | ||
120 | |||
121 | m_log.InfoFormat("[MAP IMAGE SERVICE MODULE]: enabled with refresh time {0}min and service object {1}", | ||
122 | refreshminutes, service); | ||
123 | |||
124 | m_enabled = true; | ||
125 | } | ||
126 | |||
127 | ///<summary> | ||
128 | /// | ||
129 | ///</summary> | ||
130 | |||
131 | |||
132 | ///<summary> | ||
133 | /// | ||
134 | ///</summary> | ||
135 | public void AddRegion(Scene scene) | ||
136 | { | ||
137 | if (! m_enabled) | ||
138 | return; | ||
139 | |||
140 | // Every shared region module has to maintain an indepedent list of | ||
141 | // currently running regions | ||
142 | lock (m_scenes) | ||
143 | m_scenes[scene.RegionInfo.RegionID] = scene; | ||
144 | |||
145 | scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded); | ||
146 | } | ||
147 | |||
148 | ///<summary> | ||
149 | /// | ||
150 | ///</summary> | ||
151 | public void RemoveRegion(Scene scene) | ||
152 | { | ||
153 | if (! m_enabled) | ||
154 | return; | ||
155 | |||
156 | lock (m_scenes) | ||
157 | m_scenes.Remove(scene.RegionInfo.RegionID); | ||
158 | } | ||
159 | |||
160 | #endregion ISharedRegionModule | ||
161 | |||
162 | void EventManager_OnPrimsLoaded(Scene s) | ||
163 | { | ||
164 | UploadMapTile(s); | ||
165 | } | ||
166 | |||
167 | |||
168 | ///<summary> | ||
169 | /// | ||
170 | ///</summary> | ||
171 | private void HandleMaptileRefresh(object sender, EventArgs ea) | ||
172 | { | ||
173 | // this approach is a bit convoluted becase we want to wait for the | ||
174 | // first upload to happen on startup but after all the objects are | ||
175 | // loaded and initialized | ||
176 | if (m_lastrefresh > 0 && Util.EnvironmentTickCountSubtract(m_lastrefresh) < m_refreshtime) | ||
177 | return; | ||
178 | |||
179 | m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: map refresh!"); | ||
180 | lock (m_scenes) | ||
181 | { | ||
182 | foreach (IScene scene in m_scenes.Values) | ||
183 | { | ||
184 | try | ||
185 | { | ||
186 | UploadMapTile(scene); | ||
187 | } | ||
188 | catch (Exception ex) | ||
189 | { | ||
190 | m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: something bad happened {0}", ex.Message); | ||
191 | } | ||
192 | } | ||
193 | } | ||
194 | |||
195 | m_lastrefresh = Util.EnvironmentTickCount(); | ||
196 | } | ||
197 | |||
198 | ///<summary> | ||
199 | /// | ||
200 | ///</summary> | ||
201 | private void UploadMapTile(IScene scene) | ||
202 | { | ||
203 | m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: upload maptile for {0}", scene.RegionInfo.RegionName); | ||
204 | |||
205 | // Create a PNG map tile and upload it to the AddMapTile API | ||
206 | byte[] jpgData = Utils.EmptyBytes; | ||
207 | IMapImageGenerator tileGenerator = scene.RequestModuleInterface<IMapImageGenerator>(); | ||
208 | if (tileGenerator == null) | ||
209 | { | ||
210 | m_log.Warn("[MAP IMAGE SERVICE MODULE]: Cannot upload PNG map tile without an ImageGenerator"); | ||
211 | return; | ||
212 | } | ||
213 | |||
214 | using (Image mapTile = tileGenerator.CreateMapTile()) | ||
215 | { | ||
216 | using (MemoryStream stream = new MemoryStream()) | ||
217 | { | ||
218 | mapTile.Save(stream, ImageFormat.Jpeg); | ||
219 | jpgData = stream.ToArray(); | ||
220 | } | ||
221 | } | ||
222 | |||
223 | string reason = string.Empty; | ||
224 | if (!m_MapService.AddMapTile((int)scene.RegionInfo.RegionLocX, (int)scene.RegionInfo.RegionLocY, jpgData, out reason)) | ||
225 | { | ||
226 | m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: Unable to upload tile image for {0} at {1}-{2}: {3}", | ||
227 | scene.RegionInfo.RegionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, reason); | ||
228 | } | ||
229 | |||
230 | } | ||
231 | } | ||
232 | } \ No newline at end of file | ||
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs index 6eb57eb..6163fd1 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs | |||
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
52 | public class Warp3DImageModule : IMapImageGenerator, INonSharedRegionModule | 52 | public class Warp3DImageModule : IMapImageGenerator, INonSharedRegionModule |
53 | { | 53 | { |
54 | private static readonly UUID TEXTURE_METADATA_MAGIC = new UUID("802dc0e0-f080-4931-8b57-d1be8611c4f3"); | 54 | private static readonly UUID TEXTURE_METADATA_MAGIC = new UUID("802dc0e0-f080-4931-8b57-d1be8611c4f3"); |
55 | private static readonly Color4 WATER_COLOR = new Color4(29, 71, 95, 216); | 55 | private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 216); |
56 | 56 | ||
57 | private static readonly ILog m_log = | 57 | private static readonly ILog m_log = |
58 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 58 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
61 | private IRendering m_primMesher; | 61 | private IRendering m_primMesher; |
62 | private IConfigSource m_config; | 62 | private IConfigSource m_config; |
63 | private Dictionary<UUID, Color4> m_colors = new Dictionary<UUID, Color4>(); | 63 | private Dictionary<UUID, Color4> m_colors = new Dictionary<UUID, Color4>(); |
64 | private bool m_useAntiAliasing = true; // TODO: Make this a config option | 64 | private bool m_useAntiAliasing = false; // TODO: Make this a config option |
65 | private bool m_Enabled = false; | 65 | private bool m_Enabled = false; |
66 | 66 | ||
67 | #region IRegionModule Members | 67 | #region IRegionModule Members |
@@ -192,8 +192,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
192 | 192 | ||
193 | #endregion Camera | 193 | #endregion Camera |
194 | 194 | ||
195 | renderer.Scene.addLight("Light1", new warp_Light(new warp_Vector(0.2f, 0.2f, 1f), 0xffffff, 320, 80)); | 195 | renderer.Scene.addLight("Light1", new warp_Light(new warp_Vector(1.0f, 0.5f, 1f), 0xffffff, 0, 320, 40)); |
196 | renderer.Scene.addLight("Light2", new warp_Light(new warp_Vector(-1f, -1f, 1f), 0xffffff, 100, 40)); | 196 | renderer.Scene.addLight("Light2", new warp_Light(new warp_Vector(-1f, -1f, 1f), 0xffffff, 0, 100, 40)); |
197 | 197 | ||
198 | CreateWater(renderer); | 198 | CreateWater(renderer); |
199 | CreateTerrain(renderer, textureTerrain); | 199 | CreateTerrain(renderer, textureTerrain); |
@@ -237,6 +237,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
237 | renderer.Scene.sceneobject("Water").setPos(127.5f, waterHeight, 127.5f); | 237 | renderer.Scene.sceneobject("Water").setPos(127.5f, waterHeight, 127.5f); |
238 | 238 | ||
239 | renderer.AddMaterial("WaterColor", ConvertColor(WATER_COLOR)); | 239 | renderer.AddMaterial("WaterColor", ConvertColor(WATER_COLOR)); |
240 | renderer.Scene.material("WaterColor").setReflectivity(0); // match water color with standard map module thanks lkalif | ||
240 | renderer.Scene.material("WaterColor").setTransparency((byte)((1f - WATER_COLOR.A) * 255f)); | 241 | renderer.Scene.material("WaterColor").setTransparency((byte)((1f - WATER_COLOR.A) * 255f)); |
241 | renderer.SetObjectMaterial("Water", "WaterColor"); | 242 | renderer.SetObjectMaterial("Water", "WaterColor"); |
242 | } | 243 | } |
@@ -322,6 +323,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
322 | warp_Material material = new warp_Material(texture); | 323 | warp_Material material = new warp_Material(texture); |
323 | material.setReflectivity(50); | 324 | material.setReflectivity(50); |
324 | renderer.Scene.addMaterial("TerrainColor", material); | 325 | renderer.Scene.addMaterial("TerrainColor", material); |
326 | renderer.Scene.material("TerrainColor").setReflectivity(0); // reduces tile seams a bit thanks lkalif | ||
325 | renderer.SetObjectMaterial("Terrain", "TerrainColor"); | 327 | renderer.SetObjectMaterial("Terrain", "TerrainColor"); |
326 | } | 328 | } |
327 | 329 | ||
@@ -653,4 +655,4 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
653 | return result; | 655 | return result; |
654 | } | 656 | } |
655 | } | 657 | } |
656 | } | 658 | } \ No newline at end of file |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index fc240d3..ca5529d9 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -836,7 +836,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
836 | block.Access = 254; // means 'simulator is offline' | 836 | block.Access = 254; // means 'simulator is offline' |
837 | response.Add(block); | 837 | response.Add(block); |
838 | } | 838 | } |
839 | remoteClient.SendMapBlock(response, 0); | 839 | if ((flag & 2) == 2) // V2 !!! |
840 | remoteClient.SendMapBlock(response, 2); | ||
841 | else | ||
842 | remoteClient.SendMapBlock(response, 0); | ||
840 | } | 843 | } |
841 | else | 844 | else |
842 | { | 845 | { |
@@ -859,7 +862,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
859 | MapBlockFromGridRegion(block, r); | 862 | MapBlockFromGridRegion(block, r); |
860 | mapBlocks.Add(block); | 863 | mapBlocks.Add(block); |
861 | } | 864 | } |
862 | remoteClient.SendMapBlock(mapBlocks, 0); | 865 | if ((flag & 2) == 2) // V2 !!! |
866 | remoteClient.SendMapBlock(mapBlocks, 2); | ||
867 | else | ||
868 | remoteClient.SendMapBlock(mapBlocks, 0); | ||
863 | 869 | ||
864 | return mapBlocks; | 870 | return mapBlocks; |
865 | } | 871 | } |
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs new file mode 100644 index 0000000..a953cd7 --- /dev/null +++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |||
@@ -0,0 +1,61 @@ | |||
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 | |||
28 | using System; | ||
29 | using Nini.Config; | ||
30 | using OpenSim.Server.Base; | ||
31 | using OpenSim.Services.Interfaces; | ||
32 | using OpenSim.Framework.Servers.HttpServer; | ||
33 | using OpenSim.Server.Handlers.Base; | ||
34 | |||
35 | namespace OpenSim.Server.Handlers.MapImage | ||
36 | { | ||
37 | public class MapAddServiceConnector : ServiceConnector | ||
38 | { | ||
39 | private IMapImageService m_MapService; | ||
40 | private string m_ConfigName = "MapImageService"; | ||
41 | |||
42 | public MapAddServiceConnector(IConfigSource config, IHttpServer server, string configName) : | ||
43 | base(config, server, configName) | ||
44 | { | ||
45 | IConfig serverConfig = config.Configs[m_ConfigName]; | ||
46 | if (serverConfig == null) | ||
47 | throw new Exception(String.Format("No section {0} in config file", m_ConfigName)); | ||
48 | |||
49 | string gridService = serverConfig.GetString("LocalServiceModule", | ||
50 | String.Empty); | ||
51 | |||
52 | if (gridService == String.Empty) | ||
53 | throw new Exception("No LocalServiceModule in config file"); | ||
54 | |||
55 | Object[] args = new Object[] { config }; | ||
56 | m_MapService = ServerUtils.LoadPlugin<IMapImageService>(gridService, args); | ||
57 | |||
58 | //server.AddStreamHandler(new PresenceServerPostHandler(m_PresenceService)); | ||
59 | } | ||
60 | } | ||
61 | } | ||
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs new file mode 100644 index 0000000..53d08fa --- /dev/null +++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs | |||
@@ -0,0 +1,106 @@ | |||
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 | |||
28 | using System; | ||
29 | using System.IO; | ||
30 | using System.Net; | ||
31 | using System.Reflection; | ||
32 | |||
33 | using Nini.Config; | ||
34 | using log4net; | ||
35 | |||
36 | using OpenSim.Server.Base; | ||
37 | using OpenSim.Services.Interfaces; | ||
38 | using OpenSim.Framework.Servers.HttpServer; | ||
39 | using OpenSim.Server.Handlers.Base; | ||
40 | |||
41 | namespace OpenSim.Server.Handlers.MapImage | ||
42 | { | ||
43 | public class MapGetServiceConnector : ServiceConnector | ||
44 | { | ||
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | private IMapImageService m_MapService; | ||
47 | |||
48 | private string m_ConfigName = "MapImageService"; | ||
49 | |||
50 | public MapGetServiceConnector(IConfigSource config, IHttpServer server, string configName) : | ||
51 | base(config, server, configName) | ||
52 | { | ||
53 | IConfig serverConfig = config.Configs[m_ConfigName]; | ||
54 | if (serverConfig == null) | ||
55 | throw new Exception(String.Format("No section {0} in config file", m_ConfigName)); | ||
56 | |||
57 | string gridService = serverConfig.GetString("LocalServiceModule", | ||
58 | String.Empty); | ||
59 | |||
60 | if (gridService == String.Empty) | ||
61 | throw new Exception("No LocalServiceModule in config file"); | ||
62 | |||
63 | Object[] args = new Object[] { config }; | ||
64 | m_MapService = ServerUtils.LoadPlugin<IMapImageService>(gridService, args); | ||
65 | |||
66 | server.AddStreamHandler(new MapServerGetHandler(m_MapService)); | ||
67 | } | ||
68 | } | ||
69 | |||
70 | class MapServerGetHandler : BaseStreamHandler | ||
71 | { | ||
72 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
73 | private IMapImageService m_MapService; | ||
74 | |||
75 | public MapServerGetHandler(IMapImageService service) : | ||
76 | base("GET", "/map") | ||
77 | { | ||
78 | m_MapService = service; | ||
79 | } | ||
80 | |||
81 | public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
82 | { | ||
83 | m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: retrieving {0}", path); | ||
84 | byte[] result = new byte[0]; | ||
85 | |||
86 | string format = string.Empty; | ||
87 | result = m_MapService.GetMapTile(path.Trim('/'), out format); | ||
88 | if (result.Length > 0) | ||
89 | { | ||
90 | httpResponse.StatusCode = (int)HttpStatusCode.OK; | ||
91 | if (format.Equals(".png")) | ||
92 | httpResponse.ContentType = "image/png"; | ||
93 | else if (format.Equals(".jpg") || format.Equals(".jpeg")) | ||
94 | httpResponse.ContentType = "image/jpeg"; | ||
95 | } | ||
96 | else | ||
97 | { | ||
98 | httpResponse.StatusCode = (int)HttpStatusCode.NotFound; | ||
99 | httpResponse.ContentType = "text/plain"; | ||
100 | } | ||
101 | |||
102 | return result; | ||
103 | } | ||
104 | |||
105 | } | ||
106 | } | ||
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs index 6ed8a3f..4ce406c 100644 --- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs +++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs | |||
@@ -434,7 +434,7 @@ namespace OpenSim.Services.Connectors.Hypergrid | |||
434 | XmlRpcResponse response = null; | 434 | XmlRpcResponse response = null; |
435 | try | 435 | try |
436 | { | 436 | { |
437 | response = request.Send(m_ServerURL, 4000); | 437 | response = request.Send(m_ServerURL, 6000); |
438 | } | 438 | } |
439 | catch (Exception e) | 439 | catch (Exception e) |
440 | { | 440 | { |
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs new file mode 100644 index 0000000..ff0e9d9 --- /dev/null +++ b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs | |||
@@ -0,0 +1,158 @@ | |||
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 | |||
28 | using log4net; | ||
29 | using System; | ||
30 | using System.Collections.Generic; | ||
31 | using System.IO; | ||
32 | using System.Net; | ||
33 | using System.Reflection; | ||
34 | |||
35 | using Nini.Config; | ||
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Framework.Console; | ||
38 | using OpenSim.Framework.Communications; | ||
39 | using OpenSim.Services.Interfaces; | ||
40 | using OpenMetaverse; | ||
41 | using OpenMetaverse.StructuredData; | ||
42 | |||
43 | namespace OpenSim.Services.Connectors | ||
44 | { | ||
45 | public class MapImageServicesConnector : IMapImageService | ||
46 | { | ||
47 | private static readonly ILog m_log = | ||
48 | LogManager.GetLogger( | ||
49 | MethodBase.GetCurrentMethod().DeclaringType); | ||
50 | |||
51 | private string m_ServerURI = String.Empty; | ||
52 | private IImprovedAssetCache m_Cache = null; | ||
53 | |||
54 | public MapImageServicesConnector() | ||
55 | { | ||
56 | } | ||
57 | |||
58 | public MapImageServicesConnector(string serverURI) | ||
59 | { | ||
60 | m_ServerURI = serverURI.TrimEnd('/'); | ||
61 | } | ||
62 | |||
63 | public MapImageServicesConnector(IConfigSource source) | ||
64 | { | ||
65 | Initialise(source); | ||
66 | } | ||
67 | |||
68 | public virtual void Initialise(IConfigSource source) | ||
69 | { | ||
70 | IConfig config = source.Configs["MapImageService"]; | ||
71 | if (config == null) | ||
72 | { | ||
73 | m_log.Error("[MAP IMAGE CONNECTOR]: MapImageService missing"); | ||
74 | throw new Exception("MapImage connector init error"); | ||
75 | } | ||
76 | |||
77 | string serviceURI = config.GetString("MapImageServerURI", | ||
78 | String.Empty); | ||
79 | |||
80 | if (serviceURI == String.Empty) | ||
81 | { | ||
82 | m_log.Error("[MAP IMAGE CONNECTOR]: No Server URI named in section MapImageService"); | ||
83 | throw new Exception("MapImage connector init error"); | ||
84 | } | ||
85 | m_ServerURI = serviceURI; | ||
86 | } | ||
87 | |||
88 | public bool AddMapTile(int x, int y, byte[] pngData, out string reason) | ||
89 | { | ||
90 | List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>() | ||
91 | { | ||
92 | new MultipartForm.Parameter("X", x.ToString()), | ||
93 | new MultipartForm.Parameter("Y", y.ToString()), | ||
94 | new MultipartForm.File("Tile", "tile.png", "image/png", pngData) | ||
95 | }; | ||
96 | |||
97 | reason = string.Empty; | ||
98 | int tickstart = Util.EnvironmentTickCount(); | ||
99 | |||
100 | // Make the remote storage request | ||
101 | try | ||
102 | { | ||
103 | HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI); | ||
104 | request.Timeout = 20000; | ||
105 | request.ReadWriteTimeout = 5000; | ||
106 | |||
107 | using (HttpWebResponse response = MultipartForm.Post(request, postParameters)) | ||
108 | { | ||
109 | using (Stream responseStream = response.GetResponseStream()) | ||
110 | { | ||
111 | string responseStr = responseStream.GetStreamString(); | ||
112 | OSD responseOSD = OSDParser.Deserialize(responseStr); | ||
113 | if (responseOSD.Type == OSDType.Map) | ||
114 | { | ||
115 | OSDMap responseMap = (OSDMap)responseOSD; | ||
116 | if (responseMap["Success"].AsBoolean()) | ||
117 | return true; | ||
118 | |||
119 | reason = "Upload failed: " + responseMap["Message"].AsString(); | ||
120 | } | ||
121 | else | ||
122 | { | ||
123 | reason = "Response format was invalid:\n" + responseStr; | ||
124 | } | ||
125 | } | ||
126 | } | ||
127 | } | ||
128 | catch (WebException we) | ||
129 | { | ||
130 | reason = we.Message; | ||
131 | if (we.Status == WebExceptionStatus.ProtocolError) | ||
132 | { | ||
133 | HttpWebResponse webResponse = (HttpWebResponse)we.Response; | ||
134 | reason = String.Format("[{0}] {1}", webResponse.StatusCode, webResponse.StatusDescription); | ||
135 | } | ||
136 | } | ||
137 | catch (Exception ex) | ||
138 | { | ||
139 | reason = ex.Message; | ||
140 | } | ||
141 | finally | ||
142 | { | ||
143 | // This just dumps a warning for any operation that takes more than 100 ms | ||
144 | int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); | ||
145 | m_log.DebugFormat("[MAP IMAGE CONNECTOR]: map tile uploaded in {0}ms", tickdiff); | ||
146 | } | ||
147 | |||
148 | return false; | ||
149 | } | ||
150 | |||
151 | public byte[] GetMapTile(string fileName, out string format) | ||
152 | { | ||
153 | format = string.Empty; | ||
154 | new Exception("GetMapTile method not Implemented"); | ||
155 | return null; | ||
156 | } | ||
157 | } | ||
158 | } | ||
diff --git a/OpenSim/Services/Interfaces/IMapService.cs b/OpenSim/Services/Interfaces/IMapImageService.cs index c70f484..a7b2cf1 100644 --- a/OpenSim/Services/Interfaces/IMapService.cs +++ b/OpenSim/Services/Interfaces/IMapImageService.cs | |||
@@ -31,8 +31,10 @@ using OpenMetaverse; | |||
31 | 31 | ||
32 | namespace OpenSim.Services.Interfaces | 32 | namespace OpenSim.Services.Interfaces |
33 | { | 33 | { |
34 | public interface IMapService | 34 | public interface IMapImageService |
35 | { | 35 | { |
36 | List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY); | 36 | //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY); |
37 | bool AddMapTile(int x, int y, byte[] imageData, out string reason); | ||
38 | byte[] GetMapTile(string fileName, out string format); | ||
37 | } | 39 | } |
38 | } | 40 | } |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 6683caf..e7dd15e 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -112,6 +112,14 @@ namespace OpenSim.Services.LLLoginService | |||
112 | m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); | 112 | m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty); |
113 | m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); | 113 | m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty); |
114 | 114 | ||
115 | // Clean up some of these vars | ||
116 | if (m_MapTileURL != String.Empty) | ||
117 | { | ||
118 | m_MapTileURL = m_MapTileURL.Trim(); | ||
119 | if (!m_MapTileURL.EndsWith("/")) | ||
120 | m_MapTileURL = m_MapTileURL + "/"; | ||
121 | } | ||
122 | |||
115 | // These are required; the others aren't | 123 | // These are required; the others aren't |
116 | if (accountService == string.Empty || authService == string.Empty) | 124 | if (accountService == string.Empty || authService == string.Empty) |
117 | throw new Exception("LoginService is missing service specifications"); | 125 | throw new Exception("LoginService is missing service specifications"); |
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs new file mode 100644 index 0000000..27722bb --- /dev/null +++ b/OpenSim/Services/MapImageService/MapImageService.cs | |||
@@ -0,0 +1,298 @@ | |||
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 | * The design of this map service is based on SimianGrid's PHP-based | ||
28 | * map service. See this URL for the original PHP version: | ||
29 | * https://github.com/openmetaversefoundation/simiangrid/ | ||
30 | */ | ||
31 | |||
32 | using System; | ||
33 | using System.Collections.Generic; | ||
34 | using System.Drawing; | ||
35 | using System.Drawing.Imaging; | ||
36 | using System.IO; | ||
37 | using System.Net; | ||
38 | using System.Reflection; | ||
39 | |||
40 | using Nini.Config; | ||
41 | using log4net; | ||
42 | using OpenMetaverse; | ||
43 | |||
44 | using OpenSim.Framework; | ||
45 | using OpenSim.Framework.Console; | ||
46 | using OpenSim.Services.Interfaces; | ||
47 | |||
48 | |||
49 | namespace OpenSim.Services.MapImageService | ||
50 | { | ||
51 | public class MapImageService : IMapImageService | ||
52 | { | ||
53 | private static readonly ILog m_log = | ||
54 | LogManager.GetLogger( | ||
55 | MethodBase.GetCurrentMethod().DeclaringType); | ||
56 | |||
57 | private const int ZOOM_LEVELS = 8; | ||
58 | private const int IMAGE_WIDTH = 256; | ||
59 | private const int HALF_WIDTH = 128; | ||
60 | private const int JPEG_QUALITY = 80; | ||
61 | |||
62 | private static string m_TilesStoragePath = "maptiles"; | ||
63 | |||
64 | private static object m_Sync = new object(); | ||
65 | private static bool m_Initialized = false; | ||
66 | private static string m_WaterTileFile = string.Empty; | ||
67 | private static Color m_Watercolor = Color.FromArgb(29, 71, 95); | ||
68 | |||
69 | public MapImageService(IConfigSource config) | ||
70 | { | ||
71 | if (!m_Initialized) | ||
72 | { | ||
73 | m_Initialized = true; | ||
74 | m_log.Debug("[MAP IMAGE SERVICE]: Starting MapImage service"); | ||
75 | |||
76 | IConfig serviceConfig = config.Configs["MapImageService"]; | ||
77 | if (serviceConfig != null) | ||
78 | { | ||
79 | m_TilesStoragePath = serviceConfig.GetString("TilesStoragePath", m_TilesStoragePath); | ||
80 | if (!Directory.Exists(m_TilesStoragePath)) | ||
81 | Directory.CreateDirectory(m_TilesStoragePath); | ||
82 | |||
83 | |||
84 | m_WaterTileFile = Path.Combine(m_TilesStoragePath, "water.jpg"); | ||
85 | if (!File.Exists(m_WaterTileFile)) | ||
86 | { | ||
87 | Bitmap waterTile = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH); | ||
88 | FillImage(waterTile, m_Watercolor); | ||
89 | waterTile.Save(m_WaterTileFile); | ||
90 | } | ||
91 | } | ||
92 | } | ||
93 | } | ||
94 | |||
95 | #region IMapImageService | ||
96 | |||
97 | public bool AddMapTile(int x, int y, byte[] imageData, out string reason) | ||
98 | { | ||
99 | reason = string.Empty; | ||
100 | string fileName = GetFileName(1, x, y); | ||
101 | |||
102 | lock (m_Sync) | ||
103 | { | ||
104 | try | ||
105 | { | ||
106 | using (FileStream f = File.Open(fileName, FileMode.OpenOrCreate, FileAccess.Write)) | ||
107 | f.Write(imageData, 0, imageData.Length); | ||
108 | } | ||
109 | catch (Exception e) | ||
110 | { | ||
111 | m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to save image file {0}: {1}", fileName, e); | ||
112 | reason = e.Message; | ||
113 | return false; | ||
114 | } | ||
115 | |||
116 | // Also save in png format? | ||
117 | |||
118 | // Stitch seven more aggregate tiles together | ||
119 | for (uint zoomLevel = 2; zoomLevel <= ZOOM_LEVELS; zoomLevel++) | ||
120 | { | ||
121 | // Calculate the width (in full resolution tiles) and bottom-left | ||
122 | // corner of the current zoom level | ||
123 | int width = (int)Math.Pow(2, (double)(zoomLevel - 1)); | ||
124 | int x1 = x - (x % width); | ||
125 | int y1 = y - (y % width); | ||
126 | |||
127 | if (!CreateTile(zoomLevel, x1, y1)) | ||
128 | { | ||
129 | m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to create tile for {0} at zoom level {1}", fileName, zoomLevel); | ||
130 | reason = string.Format("Map tile at zoom level {0} failed", zoomLevel); | ||
131 | return false; | ||
132 | } | ||
133 | } | ||
134 | } | ||
135 | |||
136 | return true; | ||
137 | } | ||
138 | |||
139 | public byte[] GetMapTile(string fileName, out string format) | ||
140 | { | ||
141 | format = ".jpg"; | ||
142 | string fullName = Path.Combine(m_TilesStoragePath, fileName); | ||
143 | if (File.Exists(fullName)) | ||
144 | { | ||
145 | format = Path.GetExtension(fileName).ToLower(); | ||
146 | m_log.DebugFormat("[MAP IMAGE SERVICE]: Found file {0}, extension {1}", fileName, format); | ||
147 | return File.ReadAllBytes(fullName); | ||
148 | } | ||
149 | else if (File.Exists(m_WaterTileFile)) | ||
150 | { | ||
151 | return File.ReadAllBytes(m_WaterTileFile); | ||
152 | } | ||
153 | else | ||
154 | { | ||
155 | m_log.DebugFormat("[MAP IMAGE SERVICE]: unable to get file {0}", fileName); | ||
156 | return new byte[0]; | ||
157 | } | ||
158 | } | ||
159 | |||
160 | #endregion | ||
161 | |||
162 | |||
163 | private string GetFileName(uint zoomLevel, int x, int y) | ||
164 | { | ||
165 | string extension = "jpg"; | ||
166 | return Path.Combine(m_TilesStoragePath, string.Format("map-{0}-{1}-{2}-objects.{3}", zoomLevel, x, y, extension)); | ||
167 | } | ||
168 | |||
169 | private Bitmap GetInputTileImage(string fileName) | ||
170 | { | ||
171 | try | ||
172 | { | ||
173 | if (File.Exists(fileName)) | ||
174 | return new Bitmap(fileName); | ||
175 | } | ||
176 | catch (Exception e) | ||
177 | { | ||
178 | m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to read image data from {0}: {1}", fileName, e); | ||
179 | } | ||
180 | |||
181 | return null; | ||
182 | } | ||
183 | |||
184 | private Bitmap GetOutputTileImage(string fileName) | ||
185 | { | ||
186 | try | ||
187 | { | ||
188 | if (File.Exists(fileName)) | ||
189 | return new Bitmap(fileName); | ||
190 | |||
191 | else | ||
192 | { | ||
193 | // Create a new output tile with a transparent background | ||
194 | Bitmap bm = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH, PixelFormat.Format24bppRgb); | ||
195 | bm.MakeTransparent(); | ||
196 | return bm; | ||
197 | } | ||
198 | } | ||
199 | catch (Exception e) | ||
200 | { | ||
201 | m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to read image data from {0}: {1}", fileName, e); | ||
202 | } | ||
203 | |||
204 | return null; | ||
205 | } | ||
206 | |||
207 | private bool CreateTile(uint zoomLevel, int x, int y) | ||
208 | { | ||
209 | m_log.DebugFormat("[MAP IMAGE SERVICE]: Create tile for {0} {1}, zoom {2}", x, y, zoomLevel); | ||
210 | int prevWidth = (int)Math.Pow(2, (double)zoomLevel - 2); | ||
211 | int thisWidth = (int)Math.Pow(2, (double)zoomLevel - 1); | ||
212 | |||
213 | // Convert x and y to the bottom left tile for this zoom level | ||
214 | int xIn = x - (x % prevWidth); | ||
215 | int yIn = y - (y % prevWidth); | ||
216 | |||
217 | // Convert x and y to the bottom left tile for the next zoom level | ||
218 | int xOut = x - (x % thisWidth); | ||
219 | int yOut = y - (y % thisWidth); | ||
220 | |||
221 | // Try to open the four input tiles from the previous zoom level | ||
222 | Bitmap inputBL = GetInputTileImage(GetFileName(zoomLevel - 1, xIn, yIn)); | ||
223 | Bitmap inputBR = GetInputTileImage(GetFileName(zoomLevel - 1, xIn + prevWidth, yIn)); | ||
224 | Bitmap inputTL = GetInputTileImage(GetFileName(zoomLevel - 1, xIn, yIn + prevWidth)); | ||
225 | Bitmap inputTR = GetInputTileImage(GetFileName(zoomLevel - 1, xIn + prevWidth, yIn + prevWidth)); | ||
226 | |||
227 | // Open the output tile (current zoom level) | ||
228 | string outputFile = GetFileName(zoomLevel, xOut, yOut); | ||
229 | Bitmap output = GetOutputTileImage(outputFile); | ||
230 | if (output == null) | ||
231 | return false; | ||
232 | FillImage(output, m_Watercolor); | ||
233 | |||
234 | if (inputBL != null) | ||
235 | { | ||
236 | ImageCopyResampled(output, inputBL, 0, HALF_WIDTH, 0, 0); | ||
237 | inputBL.Dispose(); | ||
238 | } | ||
239 | if (inputBR != null) | ||
240 | { | ||
241 | ImageCopyResampled(output, inputBR, HALF_WIDTH, HALF_WIDTH, 0, 0); | ||
242 | inputBR.Dispose(); | ||
243 | } | ||
244 | if (inputTL != null) | ||
245 | { | ||
246 | ImageCopyResampled(output, inputTL, 0, 0, 0, 0); | ||
247 | inputTL.Dispose(); | ||
248 | } | ||
249 | if (inputTR != null) | ||
250 | { | ||
251 | ImageCopyResampled(output, inputTR, HALF_WIDTH, 0, 0, 0); | ||
252 | inputTR.Dispose(); | ||
253 | } | ||
254 | |||
255 | // Write the modified output | ||
256 | try | ||
257 | { | ||
258 | using (Bitmap final = new Bitmap(output)) | ||
259 | { | ||
260 | output.Dispose(); | ||
261 | final.Save(outputFile, ImageFormat.Jpeg); | ||
262 | } | ||
263 | } | ||
264 | catch (Exception e) | ||
265 | { | ||
266 | m_log.WarnFormat("[MAP IMAGE SERVICE]: Oops on saving {0} {1}", outputFile, e); | ||
267 | } | ||
268 | |||
269 | // Save also as png? | ||
270 | |||
271 | return true; | ||
272 | } | ||
273 | |||
274 | #region Image utilities | ||
275 | |||
276 | private void FillImage(Bitmap bm, Color c) | ||
277 | { | ||
278 | for (int x = 0; x < bm.Width; x++) | ||
279 | for (int y = 0; y < bm.Height; y++) | ||
280 | bm.SetPixel(x, y, c); | ||
281 | } | ||
282 | |||
283 | private void ImageCopyResampled(Bitmap output, Bitmap input, int destX, int destY, int srcX, int srcY) | ||
284 | { | ||
285 | int resamplingRateX = 2; // (input.Width - srcX) / (output.Width - destX); | ||
286 | int resamplingRateY = 2; // (input.Height - srcY) / (output.Height - destY); | ||
287 | |||
288 | for (int x = destX; x < destX + HALF_WIDTH; x++) | ||
289 | for (int y = destY; y < destY + HALF_WIDTH; y++) | ||
290 | { | ||
291 | Color p = input.GetPixel(srcX + (x - destX) * resamplingRateX, srcY + (y - destY) * resamplingRateY); | ||
292 | output.SetPixel(x, y, p); | ||
293 | } | ||
294 | } | ||
295 | |||
296 | #endregion | ||
297 | } | ||
298 | } | ||
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 4ff1a26..bf89d0b 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -17,10 +17,12 @@ | |||
17 | AvatarServices = "LocalAvatarServicesConnector" | 17 | AvatarServices = "LocalAvatarServicesConnector" |
18 | EntityTransferModule = "BasicEntityTransferModule" | 18 | EntityTransferModule = "BasicEntityTransferModule" |
19 | InventoryAccessModule = "BasicInventoryAccessModule" | 19 | InventoryAccessModule = "BasicInventoryAccessModule" |
20 | MapImageService = "MapImageServiceModule" | ||
20 | 21 | ||
21 | LibraryModule = true | 22 | LibraryModule = true |
22 | LLLoginServiceInConnector = true | 23 | LLLoginServiceInConnector = true |
23 | GridInfoServiceInConnector = true | 24 | GridInfoServiceInConnector = true |
25 | MapImageServiceInConnector = true | ||
24 | 26 | ||
25 | [Profile] | 27 | [Profile] |
26 | Module = "BasicProfileModule" | 28 | Module = "BasicProfileModule" |
@@ -91,6 +93,11 @@ | |||
91 | 93 | ||
92 | WelcomeMessage = "Welcome, Avatar!" | 94 | WelcomeMessage = "Welcome, Avatar!" |
93 | 95 | ||
96 | [MapImageService] | ||
97 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" | ||
98 | ; in minutes | ||
99 | RefreshTime = 60 | ||
100 | |||
94 | ;; This should always be the very last thing on this file | 101 | ;; This should always be the very last thing on this file |
95 | [Includes] | 102 | [Includes] |
96 | Include-Common = "config-include/StandaloneCommon.ini" | 103 | Include-Common = "config-include/StandaloneCommon.ini" |
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 7359bba..29c2af1 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example | |||
@@ -99,6 +99,9 @@ | |||
99 | SRV_FriendsServerURI = "http://127.0.0.1:9000" | 99 | SRV_FriendsServerURI = "http://127.0.0.1:9000" |
100 | SRV_IMServerURI = "http://127.0.0.1:9000" | 100 | SRV_IMServerURI = "http://127.0.0.1:9000" |
101 | 101 | ||
102 | ;; For Viewer 2 | ||
103 | MapTileURL = "http://127.0.0.1:9000/" | ||
104 | |||
102 | ;; Regular expressions for controlling which client versions are accepted/denied. | 105 | ;; Regular expressions for controlling which client versions are accepted/denied. |
103 | ;; An empty string means nothing is checked. | 106 | ;; An empty string means nothing is checked. |
104 | ;; | 107 | ;; |
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 8480a77..719df5c 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini | |||
@@ -18,9 +18,10 @@ | |||
18 | GridUserServices = "LocalGridUserServicesConnector" | 18 | GridUserServices = "LocalGridUserServicesConnector" |
19 | SimulationServices = "RemoteSimulationConnectorModule" | 19 | SimulationServices = "RemoteSimulationConnectorModule" |
20 | AvatarServices = "LocalAvatarServicesConnector" | 20 | AvatarServices = "LocalAvatarServicesConnector" |
21 | MapImageService = "MapImageServiceModule" | ||
21 | EntityTransferModule = "HGEntityTransferModule" | 22 | EntityTransferModule = "HGEntityTransferModule" |
22 | InventoryAccessModule = "HGInventoryAccessModule" | 23 | InventoryAccessModule = "HGInventoryAccessModule" |
23 | FriendsModule = "HGFriendsModule" | 24 | FriendsModule = "HGFriendsModule" |
24 | 25 | ||
25 | InventoryServiceInConnector = true | 26 | InventoryServiceInConnector = true |
26 | AssetServiceInConnector = true | 27 | AssetServiceInConnector = true |
@@ -31,6 +32,7 @@ | |||
31 | GridInfoServiceInConnector = true | 32 | GridInfoServiceInConnector = true |
32 | AuthenticationServiceInConnector = true | 33 | AuthenticationServiceInConnector = true |
33 | SimulationServiceInConnector = true | 34 | SimulationServiceInConnector = true |
35 | MapImageServiceInConnector = true | ||
34 | 36 | ||
35 | [Profile] | 37 | [Profile] |
36 | Module = "BasicProfileModule" | 38 | Module = "BasicProfileModule" |
@@ -116,7 +118,12 @@ | |||
116 | GridService = "OpenSim.Services.GridService.dll:GridService" | 118 | GridService = "OpenSim.Services.GridService.dll:GridService" |
117 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" | 119 | AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService" |
118 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" | 120 | FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" |
119 | 121 | ||
122 | [MapImageService] | ||
123 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" | ||
124 | ; in minutes | ||
125 | RefreshTime = 60 | ||
126 | |||
120 | [GatekeeperService] | 127 | [GatekeeperService] |
121 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" | 128 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService" |
122 | ;; for the service | 129 | ;; for the service |
diff --git a/prebuild.xml b/prebuild.xml index feab16e..0e96176 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1300,6 +1300,36 @@ | |||
1300 | </Files> | 1300 | </Files> |
1301 | </Project> | 1301 | </Project> |
1302 | 1302 | ||
1303 | <Project frameworkVersion="v3_5" name="OpenSim.Services.MapImageService" path="OpenSim/Services/MapImageService" type="Library"> | ||
1304 | <Configuration name="Debug"> | ||
1305 | <Options> | ||
1306 | <OutputPath>../../../bin/</OutputPath> | ||
1307 | </Options> | ||
1308 | </Configuration> | ||
1309 | <Configuration name="Release"> | ||
1310 | <Options> | ||
1311 | <OutputPath>../../../bin/</OutputPath> | ||
1312 | </Options> | ||
1313 | </Configuration> | ||
1314 | |||
1315 | <ReferencePath>../../../bin/</ReferencePath> | ||
1316 | <Reference name="System"/> | ||
1317 | <Reference name="System.Drawing"/> | ||
1318 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1319 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1320 | <Reference name="OpenSim.Framework"/> | ||
1321 | <Reference name="OpenSim.Framework.Console"/> | ||
1322 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1323 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1324 | <Reference name="OpenSim.Services.Base"/> | ||
1325 | <Reference name="Nini" path="../../../bin/"/> | ||
1326 | <Reference name="log4net" path="../../../bin/"/> | ||
1327 | |||
1328 | <Files> | ||
1329 | <Match pattern="*.cs" recurse="true"/> | ||
1330 | </Files> | ||
1331 | </Project> | ||
1332 | |||
1303 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library"> | 1333 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library"> |
1304 | <Configuration name="Debug"> | 1334 | <Configuration name="Debug"> |
1305 | <Options> | 1335 | <Options> |