34 files changed, 175 insertions, 2 deletions

diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index bc638dd..8c8204a 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -31,7 +31,6 @@ using System.Net;
 using System.Text;

 using System.Text.RegularExpressions;

 using System.Threading;

-//using OpenSim.CAPS;

 using Nwc.XmlRpc;

 using System.Collections;

 using OpenSim.Framework.Console;

diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index c98cd11..8837bdb 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Communications.Local
             : base(serversInfo)

         {

             UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);

-            UserServices.AddPlugin("OpenGrid.Framework.Data.DB4o.dll");

+            UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");

             UserServer = UserServices;

             GridServer = SandBoxServices;

             InterRegion = SandBoxServices;

diff --git a/bin/TerrainDatafiles/Alien/HOWTO.txt b/bin/TerrainDatafiles/Alien/HOWTO.txt
new file mode 100644
index 0000000..00a65d7
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/HOWTO.txt
@@ -0,0 +1,19 @@
+Use the "terrain load" command to import these datafiles.

+They are stored as Float-32 arrays, use the F32 import type.

+

+These files are formatted on a scale of 0 to 1, they are designed for a range of 0..58.81

+use the 'multiply' command to multiply them by 58.81 to achieve correct height values.

+

+Example ------------------

+Region# : terrain load f32 c:\opensim\datafiles\output_x0_y0.r32

+Region# : terrain multiply 58.81

+

+

+

+        <AdamZaius>     0,0 - 1,0 - 2,0

+        <AdamZaius>     0,1 - 1,1 - 2,1

+        <AdamZaius>     0,2 - 1,2, 2,2

+

+

+for a 3x3 area on the grid

+

diff --git a/bin/TerrainDatafiles/Alien/alienworld.bmp b/bin/TerrainDatafiles/Alien/alienworld.bmp
new file mode 100644
index 0000000..0e2405e
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld.bmp
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_0.bmp b/bin/TerrainDatafiles/Alien/alienworld_0_0.bmp
new file mode 100644
index 0000000..0a3afc0
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_0_0.bmp
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_0.r32 b/bin/TerrainDatafiles/Alien/alienworld_0_0.r32
new file mode 100644
index 0000000..299dc8c
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_0_0.r32
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_1.bmp b/bin/TerrainDatafiles/Alien/alienworld_0_1.bmp
new file mode 100644
index 0000000..ec3b5d2
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_0_1.bmp
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_1.r32 b/bin/TerrainDatafiles/Alien/alienworld_0_1.r32
new file mode 100644
index 0000000..0dd41fc
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_0_1.r32
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_2.bmp b/bin/TerrainDatafiles/Alien/alienworld_0_2.bmp
new file mode 100644
index 0000000..ce341e5
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_0_2.bmp
diff --git a/bin/TerrainDatafiles/Alien/alienworld_0_2.r32 b/bin/TerrainDatafiles/Alien/alienworld_0_2.r32
new file mode 100644
index 0000000..28df00a
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_0_2.r32
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_0.bmp b/bin/TerrainDatafiles/Alien/alienworld_1_0.bmp
new file mode 100644
index 0000000..7fb3d96
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_1_0.bmp
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_0.r32 b/bin/TerrainDatafiles/Alien/alienworld_1_0.r32
new file mode 100644
index 0000000..99d5072
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_1_0.r32
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_1.bmp b/bin/TerrainDatafiles/Alien/alienworld_1_1.bmp
new file mode 100644
index 0000000..bd5d31a
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_1_1.bmp
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_1.r32 b/bin/TerrainDatafiles/Alien/alienworld_1_1.r32
new file mode 100644
index 0000000..fdb3acf
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_1_1.r32
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_2.bmp b/bin/TerrainDatafiles/Alien/alienworld_1_2.bmp
new file mode 100644
index 0000000..a5a719d
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_1_2.bmp
diff --git a/bin/TerrainDatafiles/Alien/alienworld_1_2.r32 b/bin/TerrainDatafiles/Alien/alienworld_1_2.r32
new file mode 100644
index 0000000..4e0155b
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_1_2.r32
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_0.bmp b/bin/TerrainDatafiles/Alien/alienworld_2_0.bmp
new file mode 100644
index 0000000..a5c6792
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_2_0.bmp
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_0.r32 b/bin/TerrainDatafiles/Alien/alienworld_2_0.r32
new file mode 100644
index 0000000..0c12470
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_2_0.r32
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_1.bmp b/bin/TerrainDatafiles/Alien/alienworld_2_1.bmp
new file mode 100644
index 0000000..e1f6376
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_2_1.bmp
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_1.r32 b/bin/TerrainDatafiles/Alien/alienworld_2_1.r32
new file mode 100644
index 0000000..96534b8
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_2_1.r32
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_2.bmp b/bin/TerrainDatafiles/Alien/alienworld_2_2.bmp
new file mode 100644
index 0000000..eabdd93
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_2_2.bmp
diff --git a/bin/TerrainDatafiles/Alien/alienworld_2_2.r32 b/bin/TerrainDatafiles/Alien/alienworld_2_2.r32
new file mode 100644
index 0000000..20724c3
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_2_2.r32
diff --git a/bin/TerrainDatafiles/Alien/alienworld_gray.bmp b/bin/TerrainDatafiles/Alien/alienworld_gray.bmp
new file mode 100644
index 0000000..9cc3699
--- /dev/null
+++ b/bin/TerrainDatafiles/Alien/alienworld_gray.bmp
diff --git a/bin/TerrainFilters/demofilter.cs b/bin/TerrainFilters/demofilter.cs
new file mode 100644
index 0000000..1fdfc95
--- /dev/null
+++ b/bin/TerrainFilters/demofilter.cs
@@ -0,0 +1,50 @@
+using System;

+using libTerrain;

+using OpenSim.Terrain;

+

+/// <summary>

+/// A Demonstration Filter

+/// </summary>

+public class DemoFilter : ITerrainFilter

+{

+    public void Filter(Channel heightmap, string[] args)

+    {

+        Console.WriteLine("Hello world");

+    }

+

+    public string Register()

+    {

+        return "demofilter";

+    }

+

+    public string Help()

+    {

+        return "demofilter - Does nothing\n";

+    }

+}

+

+public class SineFilter : ITerrainFilter

+{

+    public void Filter(Channel heightmap, string[] args)

+    {

+        double max = heightmap.findMax();

+

+        for (int x = 0; x < heightmap.w; x++)

+        {

+            for (int y = 0; y < heightmap.h; y++)

+            {

+                heightmap.set(x,y,((Math.Sin(heightmap.get(x,y) * Convert.ToDouble(args[1])) + 1) / 2) * max);

+            }

+        }

+    }

+

+    public string Register()

+    {

+        return "sinefilter";

+    }

+

+    public string Help()

+    {

+        return "sinefilter <theta> - Converts the heightmap to the functional output of a sine wave";

+    }

+}
\ No newline at end of file
diff --git a/bin/assets/base_shape.dat b/bin/assets/base_shape.dat
new file mode 100644
index 0000000..920c775
--- /dev/null
+++ b/bin/assets/base_shape.dat
@@ -0,0 +1,105 @@
+LLWearable version 22
+Female Shape and Outfit 3 Shape
+Created by system from avatar's appearance.
+        permissions 0
+        {
+                base_mask       00082000
+                owner_mask      00082000
+                group_mask      00082000
+                everyone_mask   00082000
+                next_owner_mask 00082000
+                creator_id      3d924400-038e-6ad9-920b-cfbb9b40585c
+                owner_id        542ffb8e-8932-49b9-8664-58f53e442797
+                last_owner_id   3d924400-038e-6ad9-920b-cfbb9b40585c
+                group_id        00000000-0000-0000-0000-000000000000
+        }
+        sale_info       0
+        {
+                sale_type       not
+                sale_price      0
+        }
+type 0
+parameters 82
+1 .21
+2 -.5
+4 -.11
+5 -.1
+6 -.3
+7 -.4
+8 -.5
+10 .7
+11 .34
+12 -.5
+13 0
+14 .04
+15 .58
+17 .56
+18 -.26
+19 -.73
+20 -.34
+21 -.01
+22 1
+23 -.5
+24 -.63
+25 .44
+27 .05
+33 -.24
+34 -.7
+35 -.16
+36 -.2
+37 -.98
+38 -.5
+80 0
+105 .07
+155 -.22
+157 0
+185 -1
+193 .86
+196 -.74
+505 .65
+506 .12
+507 -1.5
+515 0
+517 .16
+518 .8
+629 0
+637 0
+646 .4
+647 1
+649 .36
+650 .85
+652 .49
+653 -1
+656 0
+659 .65
+662 .5
+663 0
+664 0
+665 0
+675 -.15
+676 .26
+678 .28
+682 .27
+683 -.19
+684 -.09
+685 0
+690 .45
+692 .4
+693 -0
+753 -.5
+756 -.08
+758 .24
+759 .6
+760 .11
+764 -.38
+765 -.3
+769 .42
+773 .51
+795 .16
+796 .11
+799 .36
+841 0
+842 -.82
+879 0
+880 0
+textures 0
diff --git a/bin/assets/bricks.jp2 b/bin/assets/bricks.jp2
new file mode 100644
index 0000000..09c65ab
--- /dev/null
+++ b/bin/assets/bricks.jp2
diff --git a/bin/assets/granite.jp2 b/bin/assets/granite.jp2
new file mode 100644
index 0000000..b842eb8
--- /dev/null
+++ b/bin/assets/granite.jp2
diff --git a/bin/assets/hardwood.jp2 b/bin/assets/hardwood.jp2
new file mode 100644
index 0000000..8ae695e
--- /dev/null
+++ b/bin/assets/hardwood.jp2
diff --git a/bin/assets/map1.jp2 b/bin/assets/map1.jp2
new file mode 100644
index 0000000..cd2fd94
--- /dev/null
+++ b/bin/assets/map1.jp2
diff --git a/bin/assets/map_base.jp2 b/bin/assets/map_base.jp2
new file mode 100644
index 0000000..5ad1fd0
--- /dev/null
+++ b/bin/assets/map_base.jp2
diff --git a/bin/assets/plywood.jp2 b/bin/assets/plywood.jp2
new file mode 100644
index 0000000..1643ff1
--- /dev/null
+++ b/bin/assets/plywood.jp2
diff --git a/bin/assets/rocks.jp2 b/bin/assets/rocks.jp2
new file mode 100644
index 0000000..f0bbd89
--- /dev/null
+++ b/bin/assets/rocks.jp2
diff --git a/bin/assets/testpic2.jp2 b/bin/assets/testpic2.jp2
new file mode 100644
index 0000000..e6840e2
--- /dev/null
+++ b/bin/assets/testpic2.jp2
diff --git a/bin/libsecondlife.dll b/bin/libsecondlife.dll
index c89788b..1715011 100644
--- a/bin/libsecondlife.dll
+++ b/bin/libsecondlife.dll