aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorSean Dague2007-07-16 15:40:11 +0000
committerSean Dague2007-07-16 15:40:11 +0000
commit2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6 (patch)
treee3f80ad51736cf17e856547b1bcf956010927434 /bin
parent*Trunk compiles now (diff)
downloadopensim-SC_OLD-2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6.zip
opensim-SC_OLD-2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6.tar.gz
opensim-SC_OLD-2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6.tar.bz2
opensim-SC_OLD-2a3c79df83e800d5dfe75a1a3b140ed81da2b1d6.tar.xz
changed to native line ending encoding
Diffstat (limited to '')
-rw-r--r--bin/TerrainFilters/demofilter.cs98
-rw-r--r--bin/data/LICENSE-README-IMPORTANT.txt8
-rw-r--r--bin/data/avataranimations.xml18
-rw-r--r--bin/openjpegnet.dll.config10
4 files changed, 67 insertions, 67 deletions
diff --git a/bin/TerrainFilters/demofilter.cs b/bin/TerrainFilters/demofilter.cs
index 1fdfc95..4b48571 100644
--- a/bin/TerrainFilters/demofilter.cs
+++ b/bin/TerrainFilters/demofilter.cs
@@ -1,50 +1,50 @@
1using System; 1using System;
2using libTerrain; 2using libTerrain;
3using OpenSim.Terrain; 3using OpenSim.Terrain;
4 4
5/// <summary> 5/// <summary>
6/// A Demonstration Filter 6/// A Demonstration Filter
7/// </summary> 7/// </summary>
8public class DemoFilter : ITerrainFilter 8public class DemoFilter : ITerrainFilter
9{ 9{
10 public void Filter(Channel heightmap, string[] args) 10 public void Filter(Channel heightmap, string[] args)
11 { 11 {
12 Console.WriteLine("Hello world"); 12 Console.WriteLine("Hello world");
13 } 13 }
14 14
15 public string Register() 15 public string Register()
16 { 16 {
17 return "demofilter"; 17 return "demofilter";
18 } 18 }
19 19
20 public string Help() 20 public string Help()
21 { 21 {
22 return "demofilter - Does nothing\n"; 22 return "demofilter - Does nothing\n";
23 } 23 }
24} 24}
25 25
26public class SineFilter : ITerrainFilter 26public class SineFilter : ITerrainFilter
27{ 27{
28 public void Filter(Channel heightmap, string[] args) 28 public void Filter(Channel heightmap, string[] args)
29 { 29 {
30 double max = heightmap.findMax(); 30 double max = heightmap.findMax();
31 31
32 for (int x = 0; x < heightmap.w; x++) 32 for (int x = 0; x < heightmap.w; x++)
33 { 33 {
34 for (int y = 0; y < heightmap.h; y++) 34 for (int y = 0; y < heightmap.h; y++)
35 { 35 {
36 heightmap.set(x,y,((Math.Sin(heightmap.get(x,y) * Convert.ToDouble(args[1])) + 1) / 2) * max); 36 heightmap.set(x,y,((Math.Sin(heightmap.get(x,y) * Convert.ToDouble(args[1])) + 1) / 2) * max);
37 } 37 }
38 } 38 }
39 } 39 }
40 40
41 public string Register() 41 public string Register()
42 { 42 {
43 return "sinefilter"; 43 return "sinefilter";
44 } 44 }
45 45
46 public string Help() 46 public string Help()
47 { 47 {
48 return "sinefilter <theta> - Converts the heightmap to the functional output of a sine wave"; 48 return "sinefilter <theta> - Converts the heightmap to the functional output of a sine wave";
49 } 49 }
50} \ No newline at end of file 50} \ No newline at end of file
diff --git a/bin/data/LICENSE-README-IMPORTANT.txt b/bin/data/LICENSE-README-IMPORTANT.txt
index 3229102..86e401f 100644
--- a/bin/data/LICENSE-README-IMPORTANT.txt
+++ b/bin/data/LICENSE-README-IMPORTANT.txt
@@ -1,5 +1,5 @@
1Not all of the files in this directory are licensed under the BSD license. Some of these files come with the Second Life viewer and are considered licensed under a Creative Commons License. 1Not all of the files in this directory are licensed under the BSD license. Some of these files come with the Second Life viewer and are considered licensed under a Creative Commons License.
2 2
3These files are: 3These files are:
4 4
5- avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License) \ No newline at end of file 5- avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License) \ No newline at end of file
diff --git a/bin/data/avataranimations.xml b/bin/data/avataranimations.xml
index 461613f..8a98c62 100644
--- a/bin/data/avataranimations.xml
+++ b/bin/data/avataranimations.xml
@@ -1,10 +1,10 @@
1<?xml version="1.0" encoding="iso-8859-1"?> 1<?xml version="1.0" encoding="iso-8859-1"?>
2<!-- Copyright(C) 2002-2007 Linden Lab, OpenSim Developers --> 2<!-- Copyright(C) 2002-2007 Linden Lab, OpenSim Developers -->
3<!-- Based on viewerart.ini packaged with the viewer. --> 3<!-- Based on viewerart.ini packaged with the viewer. -->
4<!-- This file is a derivative work of the above while it contains default animation UUIDs --> 4<!-- This file is a derivative work of the above while it contains default animation UUIDs -->
5<!-- Licensed under a creative commons license (By-SA) http://creativecommons.org/licenses/by-sa/2.5/ --> 5<!-- Licensed under a creative commons license (By-SA) http://creativecommons.org/licenses/by-sa/2.5/ -->
6<animations> 6<animations>
7 <animation name="STAND">2408fe9e-df1d-1d7d-f4ff-1384fa7b350f</animation> 7 <animation name="STAND">2408fe9e-df1d-1d7d-f4ff-1384fa7b350f</animation>
8 <animation name="WALK">6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0</animation> 8 <animation name="WALK">6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0</animation>
9 <animation name="FLY">aec4610c-757f-bc4e-c092-c6e9caf18daf</animation> 9 <animation name="FLY">aec4610c-757f-bc4e-c092-c6e9caf18daf</animation>
10</animations> \ No newline at end of file 10</animations> \ No newline at end of file
diff --git a/bin/openjpegnet.dll.config b/bin/openjpegnet.dll.config
index 665b78d..d705199 100644
--- a/bin/openjpegnet.dll.config
+++ b/bin/openjpegnet.dll.config
@@ -1,5 +1,5 @@
1<configuration> 1<configuration>
2 <dllmap os="osx" dll="openjpeg-libsl.dll" target="libopenjpeg-1.1.0.dylib" /> 2 <dllmap os="osx" dll="openjpeg-libsl.dll" target="libopenjpeg-1.1.0.dylib" />
3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-libsl.dll" target="libopenjpeg-1.0.0-x86_64.so" /> 3 <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-libsl.dll" target="libopenjpeg-1.0.0-x86_64.so" />
4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-libsl.dll" target="libopenjpeg-1.0.0.so" /> 4 <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-libsl.dll" target="libopenjpeg-1.0.0.so" />
5</configuration> 5</configuration>