aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-06-28 11:54:51 +0000
committerMW2007-06-28 11:54:51 +0000
commit14ea54b44158a68aed767bbf5cc3497b4f64850c (patch)
tree9a31ae4546f8d801f81f7a5e22211b6570745a27
parent*Added missing files from last commit (oops!) (diff)
downloadopensim-SC_OLD-14ea54b44158a68aed767bbf5cc3497b4f64850c.zip
opensim-SC_OLD-14ea54b44158a68aed767bbf5cc3497b4f64850c.tar.gz
opensim-SC_OLD-14ea54b44158a68aed767bbf5cc3497b4f64850c.tar.bz2
opensim-SC_OLD-14ea54b44158a68aed767bbf5cc3497b4f64850c.tar.xz
should now work.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs1
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs2
-rw-r--r--bin/TerrainDatafiles/Alien/HOWTO.txt19
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld.bmpbin0 -> 1048630 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_0_0.bmpbin0 -> 262198 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_0_0.r32bin0 -> 262144 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_0_1.bmpbin0 -> 262198 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_0_1.r32bin0 -> 262144 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_0_2.bmpbin0 -> 262198 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_0_2.r32bin0 -> 262144 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_1_0.bmpbin0 -> 262198 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_1_0.r32bin0 -> 262144 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_1_1.bmpbin0 -> 262198 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_1_1.r32bin0 -> 262144 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_1_2.bmpbin0 -> 262198 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_1_2.r32bin0 -> 262144 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_2_0.bmpbin0 -> 262198 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_2_0.r32bin0 -> 262144 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_2_1.bmpbin0 -> 262198 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_2_1.r32bin0 -> 262144 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_2_2.bmpbin0 -> 262198 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_2_2.r32bin0 -> 262144 bytes
-rw-r--r--bin/TerrainDatafiles/Alien/alienworld_gray.bmpbin0 -> 786486 bytes
-rw-r--r--bin/TerrainFilters/demofilter.cs50
-rw-r--r--bin/assets/base_shape.dat105
-rw-r--r--bin/assets/bricks.jp2bin0 -> 32865 bytes
-rw-r--r--bin/assets/granite.jp2bin0 -> 32897 bytes
-rw-r--r--bin/assets/hardwood.jp2bin0 -> 32876 bytes
-rw-r--r--bin/assets/map1.jp2bin0 -> 570 bytes
-rw-r--r--bin/assets/map_base.jp2bin0 -> 153 bytes
-rw-r--r--bin/assets/plywood.jp2bin0 -> 32794 bytes
-rw-r--r--bin/assets/rocks.jp2bin0 -> 32731 bytes
-rw-r--r--bin/assets/testpic2.jp2bin0 -> 291 bytes
-rw-r--r--bin/libsecondlife.dllbin2166784 -> 2256896 bytes
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;
31using System.Text; 31using System.Text;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using System.Threading; 33using System.Threading;
34//using OpenSim.CAPS;
35using Nwc.XmlRpc; 34using Nwc.XmlRpc;
36using System.Collections; 35using System.Collections;
37using OpenSim.Framework.Console; 36using 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
47 : base(serversInfo) 47 : base(serversInfo)
48 { 48 {
49 UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY); 49 UserServices = new LocalUserServices(this , serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY);
50 UserServices.AddPlugin("OpenGrid.Framework.Data.DB4o.dll"); 50 UserServices.AddPlugin("OpenSim.Framework.Data.DB4o.dll");
51 UserServer = UserServices; 51 UserServer = UserServices;
52 GridServer = SandBoxServices; 52 GridServer = SandBoxServices;
53 InterRegion = SandBoxServices; 53 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 @@
1Use the "terrain load" command to import these datafiles.
2They are stored as Float-32 arrays, use the F32 import type.
3
4These files are formatted on a scale of 0 to 1, they are designed for a range of 0..58.81
5use the 'multiply' command to multiply them by 58.81 to achieve correct height values.
6
7Example ------------------
8Region# : terrain load f32 c:\opensim\datafiles\output_x0_y0.r32
9Region# : terrain multiply 58.81
10
11
12
13 <AdamZaius> 0,0 - 1,0 - 2,0
14 <AdamZaius> 0,1 - 1,1 - 2,1
15 <AdamZaius> 0,2 - 1,2, 2,2
16
17
18for a 3x3 area on the grid
19
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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 @@
1using System;
2using libTerrain;
3using OpenSim.Terrain;
4
5/// <summary>
6/// A Demonstration Filter
7/// </summary>
8public class DemoFilter : ITerrainFilter
9{
10 public void Filter(Channel heightmap, string[] args)
11 {
12 Console.WriteLine("Hello world");
13 }
14
15 public string Register()
16 {
17 return "demofilter";
18 }
19
20 public string Help()
21 {
22 return "demofilter - Does nothing\n";
23 }
24}
25
26public class SineFilter : ITerrainFilter
27{
28 public void Filter(Channel heightmap, string[] args)
29 {
30 double max = heightmap.findMax();
31
32 for (int x = 0; x < heightmap.w; x++)
33 {
34 for (int y = 0; y < heightmap.h; y++)
35 {
36 heightmap.set(x,y,((Math.Sin(heightmap.get(x,y) * Convert.ToDouble(args[1])) + 1) / 2) * max);
37 }
38 }
39 }
40
41 public string Register()
42 {
43 return "sinefilter";
44 }
45
46 public string Help()
47 {
48 return "sinefilter <theta> - Converts the heightmap to the functional output of a sine wave";
49 }
50} \ 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 @@
1LLWearable version 22
2Female Shape and Outfit 3 Shape
3Created by system from avatar's appearance.
4 permissions 0
5 {
6 base_mask 00082000
7 owner_mask 00082000
8 group_mask 00082000
9 everyone_mask 00082000
10 next_owner_mask 00082000
11 creator_id 3d924400-038e-6ad9-920b-cfbb9b40585c
12 owner_id 542ffb8e-8932-49b9-8664-58f53e442797
13 last_owner_id 3d924400-038e-6ad9-920b-cfbb9b40585c
14 group_id 00000000-0000-0000-0000-000000000000
15 }
16 sale_info 0
17 {
18 sale_type not
19 sale_price 0
20 }
21type 0
22parameters 82
231 .21
242 -.5
254 -.11
265 -.1
276 -.3
287 -.4
298 -.5
3010 .7
3111 .34
3212 -.5
3313 0
3414 .04
3515 .58
3617 .56
3718 -.26
3819 -.73
3920 -.34
4021 -.01
4122 1
4223 -.5
4324 -.63
4425 .44
4527 .05
4633 -.24
4734 -.7
4835 -.16
4936 -.2
5037 -.98
5138 -.5
5280 0
53105 .07
54155 -.22
55157 0
56185 -1
57193 .86
58196 -.74
59505 .65
60506 .12
61507 -1.5
62515 0
63517 .16
64518 .8
65629 0
66637 0
67646 .4
68647 1
69649 .36
70650 .85
71652 .49
72653 -1
73656 0
74659 .65
75662 .5
76663 0
77664 0
78665 0
79675 -.15
80676 .26
81678 .28
82682 .27
83683 -.19
84684 -.09
85685 0
86690 .45
87692 .4
88693 -0
89753 -.5
90756 -.08
91758 .24
92759 .6
93760 .11
94764 -.38
95765 -.3
96769 .42
97773 .51
98795 .16
99796 .11
100799 .36
101841 0
102842 -.82
103879 0
104880 0
105textures 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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/bin/libsecondlife.dll b/bin/libsecondlife.dll
index c89788b..1715011 100644
--- a/bin/libsecondlife.dll
+++ b/bin/libsecondlife.dll
Binary files differ