aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-06-02 01:34:00 +0000
committerAdam Frisby2007-06-02 01:34:00 +0000
commit6072fd86675d81c52371ad4d5f2b942a2e00da7f (patch)
tree216bfef97785cb2aebe5bffe445b45c99f6b061e
parent* GridManagementAgent is now documented (diff)
downloadopensim-SC_OLD-6072fd86675d81c52371ad4d5f2b942a2e00da7f.zip
opensim-SC_OLD-6072fd86675d81c52371ad4d5f2b942a2e00da7f.tar.gz
opensim-SC_OLD-6072fd86675d81c52371ad4d5f2b942a2e00da7f.tar.bz2
opensim-SC_OLD-6072fd86675d81c52371ad4d5f2b942a2e00da7f.tar.xz
* Some commenting on asset server (needs completing)
* Removed strip2.png - added defaultstripe.png * World map images are now generated when the terrain is tainted, not yet sent to the grid/asset server.
-rw-r--r--OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs26
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs37
-rw-r--r--OpenGridServices/OpenGridServices.AssetServer/Main.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/world/World.cs2
-rw-r--r--bin/defaultstripe.png (renamed from bin/stripe3.png)bin887 -> 887 bytes
5 files changed, 66 insertions, 0 deletions
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
index 7da16db..8779438 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/SQLiteManager.cs
@@ -1,3 +1,29 @@
1/*
2* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
3*
4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission.
14*
15* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25*
26*/
1using System; 27using System;
2using System.Collections.Generic; 28using System.Collections.Generic;
3using System.Text; 29using System.Text;
diff --git a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs b/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
index 8439e92..023e4c1 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
+++ b/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
@@ -1,3 +1,29 @@
1/*
2* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
3*
4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission.
14*
15* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25*
26*/
1using System; 27using System;
2using System.Collections.Generic; 28using System.Collections.Generic;
3using System.Net; 29using System.Net;
@@ -12,13 +38,24 @@ using OpenSim.Servers;
12 38
13namespace OpenGridServices.AssetServer 39namespace OpenGridServices.AssetServer
14{ 40{
41 /// <summary>
42 /// An HTTP server for sending assets
43 /// </summary>
15 public class AssetHttpServer :BaseHttpServer 44 public class AssetHttpServer :BaseHttpServer
16 { 45 {
46 /// <summary>
47 /// Creates the new asset server
48 /// </summary>
49 /// <param name="port">Port to initalise on</param>
17 public AssetHttpServer(int port) 50 public AssetHttpServer(int port)
18 : base(port) 51 : base(port)
19 { 52 {
20 } 53 }
21 54
55 /// <summary>
56 /// Handles an HTTP request
57 /// </summary>
58 /// <param name="stateinfo">HTTP State Info</param>
22 public override void HandleRequest(Object stateinfo) 59 public override void HandleRequest(Object stateinfo)
23 { 60 {
24 try 61 try
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
index 0661fc5..334d3c5 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.AssetServer/Main.cs
@@ -49,6 +49,7 @@ using Db4objects.Db4o.Query;
49namespace OpenGridServices.AssetServer 49namespace OpenGridServices.AssetServer
50{ 50{
51 /// <summary> 51 /// <summary>
52 /// An asset server
52 /// </summary> 53 /// </summary>
53 public class OpenAsset_Main : BaseServer, conscmd_callback 54 public class OpenAsset_Main : BaseServer, conscmd_callback
54 { 55 {
diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs
index ef6833c..22beb0e 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim/OpenSim.RegionServer/world/World.cs
@@ -229,6 +229,8 @@ namespace OpenSim.world
229 Terrain.tainted = 0; 229 Terrain.tainted = 0;
230 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving."); 230 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");
231 localStorage.SaveMap(Terrain.getHeights1D()); 231 localStorage.SaveMap(Terrain.getHeights1D());
232 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Rebuilding world map image.");
233 Terrain.exportImage("map_" + m_regInfo.RegionName + ".png", "defaultstripe.png");
232 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics."); 234 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");
233 phyScene.SetTerrain(Terrain.getHeights1D()); 235 phyScene.SetTerrain(Terrain.getHeights1D());
234 236
diff --git a/bin/stripe3.png b/bin/defaultstripe.png
index 9db19c8..9db19c8 100644
--- a/bin/stripe3.png
+++ b/bin/defaultstripe.png
Binary files differ