11 files changed, 282 insertions, 279 deletions

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 53da7d6..73a46e7 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,45 +1,45 @@
-The following people have contributed to OpenSim (Thank you 

-for your effort!)

-

-Add your name in here if you have committed to OpenSim

-

-OpenSim Developers 

-

-* MW

-* Adam Frisby   (DeepThink Pty Ltd)

-* MingChen      (DeepThink Pty Ltd)

-* lbsa71

-* sdague        (International Business Machines Corp.)

-* Andy- 

-* Gareth

-* MorphW

-* CW

-* Babblefrog

-* Tedd

-

-Patches

-

-* BigFootAg

-* Danx0r

-* Dalien

-* Darok

-

-Testers

-

-* Ckrinke

-

-

-This software uses components from the following developers:

-* Sleepycat Software (Berkeley DB)

-* DB4objects, Inc. (DB4o)

-* SQLite (Public Domain)

-* XmlRpcCS (http://xmlrpccs.sf.net/)

-* MySQL, Inc. (MySQL Connector/NET)

-* AGEIA Inc. (PhysX)

-* Russel L. Smith (ODE)

-* Prebuild ( http://sourceforge.net/projects/dnpb/ )

-

-In addition, we would like to thank:

-* The Mono Project

-* The NANT Developers

-* Microsoft (.NET, MSSQL-Adapters)

+The following people have contributed to OpenSim (Thank you 
+for your effort!)
+
+Add your name in here if you have committed to OpenSim
+
+OpenSim Developers 
+
+* MW
+* Adam Frisby   (DeepThink Pty Ltd)
+* MingChen      (DeepThink Pty Ltd)
+* lbsa71
+* sdague        (International Business Machines Corp.)
+* Andy- 
+* Gareth
+* MorphW
+* CW
+* Babblefrog
+* Tedd
+
+Patches
+
+* BigFootAg
+* Danx0r
+* Dalien
+* Darok
+
+Testers
+
+* Ckrinke
+
+
+This software uses components from the following developers:
+* Sleepycat Software (Berkeley DB)
+* DB4objects, Inc. (DB4o)
+* SQLite (Public Domain)
+* XmlRpcCS (http://xmlrpccs.sf.net/)
+* MySQL, Inc. (MySQL Connector/NET)
+* AGEIA Inc. (PhysX)
+* Russel L. Smith (ODE)
+* Prebuild ( http://sourceforge.net/projects/dnpb/ )
+
+In addition, we would like to thank:
+* The Mono Project
+* The NANT Developers
+* Microsoft (.NET, MSSQL-Adapters)
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql b/OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql
index b9c1b97..2c750fe 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql
@@ -1,11 +1,11 @@
-CREATE TABLE `assets` (

-  `id` binary(16) NOT NULL,

-  `name` varchar(64) NOT NULL,

-  `description` varchar(64) NOT NULL,

-  `assetType` tinyint(4) NOT NULL,

-  `invType` tinyint(4) NOT NULL,

-  `local` tinyint(1) NOT NULL,

-  `temporary` tinyint(1) NOT NULL,

-  `data` longblob NOT NULL,

-  PRIMARY KEY (`id`)

+CREATE TABLE `assets` (
+  `id` binary(16) NOT NULL,
+  `name` varchar(64) NOT NULL,
+  `description` varchar(64) NOT NULL,
+  `assetType` tinyint(4) NOT NULL,
+  `invType` tinyint(4) NOT NULL,
+  `local` tinyint(1) NOT NULL,
+  `temporary` tinyint(1) NOT NULL,
+  `data` longblob NOT NULL,
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
\ No newline at end of file
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql b/OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql
index 2bb5553..b5bddde 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql
@@ -1,11 +1,11 @@
-CREATE TABLE `inventoryfolders` (

-  `folderID` varchar(36) NOT NULL default '',

-  `agentID` varchar(36) default NULL,

-  `parentFolderID` varchar(36) default NULL,

-  `folderName` varchar(64) default NULL,

-  `type` smallint NOT NULL default 0,

-  `version` int NOT NULL default 0,

-  PRIMARY KEY  (`folderID`),

-  KEY `owner` (`agentID`),

-  KEY `parent` (`parentFolderID`)

-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2';

+CREATE TABLE `inventoryfolders` (
+  `folderID` varchar(36) NOT NULL default '',
+  `agentID` varchar(36) default NULL,
+  `parentFolderID` varchar(36) default NULL,
+  `folderName` varchar(64) default NULL,
+  `type` smallint NOT NULL default 0,
+  `version` int NOT NULL default 0,
+  PRIMARY KEY  (`folderID`),
+  KEY `owner` (`agentID`),
+  KEY `parent` (`parentFolderID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2';
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql b/OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql
index 8c79483..53d2db0 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql
@@ -1,18 +1,18 @@
-CREATE TABLE `inventoryitems` (

-  `inventoryID` varchar(36) NOT NULL default '',

-  `assetID` varchar(36) default NULL,

-  `assetType` int(11) default NULL,

-  `parentFolderID` varchar(36) default NULL,

-  `avatarID` varchar(36) default NULL,

-  `inventoryName` varchar(64) default NULL,

-  `inventoryDescription` varchar(64) default NULL,

-  `inventoryNextPermissions` int(10) unsigned default NULL,

-  `inventoryCurrentPermissions` int(10) unsigned default NULL,

-  `invType` int(11) default NULL,

-  `creatorID` varchar(36) default NULL,

-  `inventoryBasePermissions` int(10) unsigned NOT NULL default 0,

-  `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0,

-  PRIMARY KEY  (`inventoryID`),

-  KEY `owner` (`avatarID`),

-  KEY `folder` (`parentFolderID`)

-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2';

+CREATE TABLE `inventoryitems` (
+  `inventoryID` varchar(36) NOT NULL default '',
+  `assetID` varchar(36) default NULL,
+  `assetType` int(11) default NULL,
+  `parentFolderID` varchar(36) default NULL,
+  `avatarID` varchar(36) default NULL,
+  `inventoryName` varchar(64) default NULL,
+  `inventoryDescription` varchar(64) default NULL,
+  `inventoryNextPermissions` int(10) unsigned default NULL,
+  `inventoryCurrentPermissions` int(10) unsigned default NULL,
+  `invType` int(11) default NULL,
+  `creatorID` varchar(36) default NULL,
+  `inventoryBasePermissions` int(10) unsigned NOT NULL default 0,
+  `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0,
+  PRIMARY KEY  (`inventoryID`),
+  KEY `owner` (`avatarID`),
+  KEY `folder` (`parentFolderID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2';
diff --git a/OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql b/OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql
index 813c7c4..b5a7964 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql
@@ -1,4 +1,4 @@
-ALTER TABLE `inventoryfolders` 

-        ADD COLUMN `type` smallint NOT NULL default 0,

-        ADD COLUMN `version` int NOT NULL default 0,

-COMMENT='Rev. 2';

+ALTER TABLE `inventoryfolders` 
+        ADD COLUMN `type` smallint NOT NULL default 0,
+        ADD COLUMN `version` int NOT NULL default 0,
+COMMENT='Rev. 2';
diff --git a/OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql b/OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql
index c47786c..d1ef504 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql
@@ -1,9 +1,9 @@
-ALTER TABLE `inventoryitems` 

-        CHANGE COLUMN `type` `assetType` int(11) default NULL,

-        ADD COLUMN `invType` int(11) default NULL,

-        ADD COLUMN `creatorID` varchar(36) default NULL,

-        ADD COLUMN `inventoryBasePermissions` int(10) unsigned NOT NULL default 0,

-        ADD COLUMN `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0,

-COMMENT='Rev. 2';

-

-UPDATE `inventoryitems` SET invType=assetType;

+ALTER TABLE `inventoryitems` 
+        CHANGE COLUMN `type` `assetType` int(11) default NULL,
+        ADD COLUMN `invType` int(11) default NULL,
+        ADD COLUMN `creatorID` varchar(36) default NULL,
+        ADD COLUMN `inventoryBasePermissions` int(10) unsigned NOT NULL default 0,
+        ADD COLUMN `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0,
+COMMENT='Rev. 2';
+
+UPDATE `inventoryitems` SET invType=assetType;
diff --git a/ThirdPartyLicenses/Nini.txt b/ThirdPartyLicenses/Nini.txt
index 6de2d7f..fe38b62 100644
--- a/ThirdPartyLicenses/Nini.txt
+++ b/ThirdPartyLicenses/Nini.txt
@@ -1,23 +1,23 @@
-

-Nini Configuration Project.

-Copyright (c) 2006 Brent R. Matzelle

-

-Permission is hereby granted, free of charge, to any person obtaining

-a copy of this software and associated documentation files (the

-"Software"), to deal in the Software without restriction, including

-without limitation the rights to use, copy, modify, merge, publish,

-distribute, sublicense, and/or sell copies of the Software, and to

-permit persons to whom the Software is furnished to do so, subject to

-the following conditions:

-

-The above copyright notice and this permission notice shall be

-included in all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

+
+Nini Configuration Project.
+Copyright (c) 2006 Brent R. Matzelle
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/ThirdPartyLicenses/XML-RPC.NET.txt b/ThirdPartyLicenses/XML-RPC.NET.txt
index d135523..2aff37f 100644
--- a/ThirdPartyLicenses/XML-RPC.NET.txt
+++ b/ThirdPartyLicenses/XML-RPC.NET.txt
@@ -1,27 +1,27 @@
-XML-RPC.NET - XML-RPC for .NET 

-v2.1.0

-Copyright (C) 2001-2006 Charles Cook (chascook@gmail.com)

-

-xmlrpcgen 

-Copyright (C) 2003 Joe Bork

-

-For more information about XML-RPC.NET visit http://www.xml-rpc.net.

-

-XML-RPC.NET is licensed with MIT X11 license.

-(see http://www.xml-rpc.net/faq/xmlrpcnetfaq.html#6.12)

-

-For more information about XML-RPC refer to http://www.xmlrpc.com/

-

-

-PREQUISITES

------------

-Assembly CookComputing.XmlRpc.dll requires 1.0 .NET runtime and 

-runs on all later versions.

-

-Assembly CookComputing.XmlRpcV2.dll requires 2.0 .NET runtime.

-

-

-DOCUMENTATION

--------------

-For help on using XML-RPC.NET, see 

+XML-RPC.NET - XML-RPC for .NET 
+v2.1.0
+Copyright (C) 2001-2006 Charles Cook (chascook@gmail.com)
+
+xmlrpcgen 
+Copyright (C) 2003 Joe Bork
+
+For more information about XML-RPC.NET visit http://www.xml-rpc.net.
+
+XML-RPC.NET is licensed with MIT X11 license.
+(see http://www.xml-rpc.net/faq/xmlrpcnetfaq.html#6.12)
+
+For more information about XML-RPC refer to http://www.xmlrpc.com/
+
+
+PREQUISITES
+-----------
+Assembly CookComputing.XmlRpc.dll requires 1.0 .NET runtime and 
+runs on all later versions.
+
+Assembly CookComputing.XmlRpcV2.dll requires 2.0 .NET runtime.
+
+
+DOCUMENTATION
+-------------
+For help on using XML-RPC.NET, see 
 http://www.xml-rpc.net/faq/xmlrpcnetfaq.html.
\ No newline at end of file
diff --git a/bin/assets/Avatar/Newruth/Settings.txt b/bin/assets/Avatar/Newruth/Settings.txt
index 58b2485..16bc5ad 100644
--- a/bin/assets/Avatar/Newruth/Settings.txt
+++ b/bin/assets/Avatar/Newruth/Settings.txt
@@ -1,120 +1,120 @@
-Sliders:

-

-Shape

-

-Body

-Height - 70

-Thickness - 8

-Body Fat - 3

-

-

-Head

-Head size - 67

-Head Stretch - 43

-Head Shape - 55

-Egg Head - 72

-Head Length - 71

-Face Shear - 50

-Forehead Angle - 61

-Brow Size - 4

-Upper Cheeks - 42

-Lower Cheeks - 34

-Cheekbones - 67

-

-Eyes

-Eye size - 35

-Eye opening - 59

-Eye spacing - 44

-Outer Eye Corner - 58

-Inner Eye Corner - 0

-Eye Depth - 39

-Upper Eyelid Fold - 14

-Eye bags - 0

-Puffy Eyelids - 6

-Eyelash Length - 0

-Eye Pop - 50

-

-Ears

-Ear Size - 39

-Ear Angle - 38

-Attached Earlobes - 37

-Ear Flaps - 6

-

-Nose

-Nose size - 24

-Nostril Width - 24

-Nostril Division - 61

-Nose thickness - 26

-Upper Bridge - 18

-lower bridge - 64

-bridge width - 58

-nose tip angle - 51

-nose tip shape - 0

-crooked nose - 50

-

-Mouth

-Lip width - 16

-Lip fullness - 35

-Lip thickness - 62

-Lip ratio - 43

-Mouth position - 43

-Mouth corner - 59

-Lip cleft depth - 42

-Lip cleft - 41

-Shift mouth - 50

-

-Chin

-Chin angle - 22

-Jaw shape - 21

-Chin depth - 26

-Jaw angle 0 64

-Jaw jut - 54

-Jowls - 39

-Chin cleft - 0

-Upper chin cleft - 15

-Chin Neck - 17

-

-Torso

-Torso muscles - 46

-Neck thickness - 50

-Neck length - 28

-Shoulders - 57

-Breast size - 53

-Breast buoyancy - 34

-Breast Cleavage  - 16

-Arm length - 46

-Hand size - 47

-Torse length - 37

-Love handles - 36

-Belly size - 13

-

-Legs

-Leg muscles - 69

-Leg length - 54

-Hip width - 53

-Butt size - 40

-Saddle bags - 27

-Knee angle - 44

-Foot size - 0

-

-Hair

-Color

-White hair - 11

-Rainbow color - 0

-Blonde hair - 0

-Red hair - 100

-

-Style

-Hair volume - 45

-Hair front - 0

-Hair sides - 27

-Hair Back - 100

-Big Hair Front - 61

-Big Hair Top - 90

-Big hair back - 12

-Front fringe - 33

-Side fringe - 24

-Back fringe - 9

-Full hair sides - 75

-

-

+Sliders:
+
+Shape
+
+Body
+Height - 70
+Thickness - 8
+Body Fat - 3
+
+
+Head
+Head size - 67
+Head Stretch - 43
+Head Shape - 55
+Egg Head - 72
+Head Length - 71
+Face Shear - 50
+Forehead Angle - 61
+Brow Size - 4
+Upper Cheeks - 42
+Lower Cheeks - 34
+Cheekbones - 67
+
+Eyes
+Eye size - 35
+Eye opening - 59
+Eye spacing - 44
+Outer Eye Corner - 58
+Inner Eye Corner - 0
+Eye Depth - 39
+Upper Eyelid Fold - 14
+Eye bags - 0
+Puffy Eyelids - 6
+Eyelash Length - 0
+Eye Pop - 50
+
+Ears
+Ear Size - 39
+Ear Angle - 38
+Attached Earlobes - 37
+Ear Flaps - 6
+
+Nose
+Nose size - 24
+Nostril Width - 24
+Nostril Division - 61
+Nose thickness - 26
+Upper Bridge - 18
+lower bridge - 64
+bridge width - 58
+nose tip angle - 51
+nose tip shape - 0
+crooked nose - 50
+
+Mouth
+Lip width - 16
+Lip fullness - 35
+Lip thickness - 62
+Lip ratio - 43
+Mouth position - 43
+Mouth corner - 59
+Lip cleft depth - 42
+Lip cleft - 41
+Shift mouth - 50
+
+Chin
+Chin angle - 22
+Jaw shape - 21
+Chin depth - 26
+Jaw angle 0 64
+Jaw jut - 54
+Jowls - 39
+Chin cleft - 0
+Upper chin cleft - 15
+Chin Neck - 17
+
+Torso
+Torso muscles - 46
+Neck thickness - 50
+Neck length - 28
+Shoulders - 57
+Breast size - 53
+Breast buoyancy - 34
+Breast Cleavage  - 16
+Arm length - 46
+Hand size - 47
+Torse length - 37
+Love handles - 36
+Belly size - 13
+
+Legs
+Leg muscles - 69
+Leg length - 54
+Hip width - 53
+Butt size - 40
+Saddle bags - 27
+Knee angle - 44
+Foot size - 0
+
+Hair
+Color
+White hair - 11
+Rainbow color - 0
+Blonde hair - 0
+Red hair - 100
+
+Style
+Hair volume - 45
+Hair front - 0
+Hair sides - 27
+Hair Back - 100
+Big Hair Front - 61
+Big Hair Top - 90
+Big hair back - 12
+Front fringe - 33
+Side fringe - 24
+Back fringe - 9
+Full hair sides - 75
+
+
diff --git a/set-eol-style.sh b/set-eol-style.sh
index 30c3e0f..af8887b 100755
--- a/set-eol-style.sh
+++ b/set-eol-style.sh
@@ -2,14 +2,17 @@
 
 set_eol_style()
 {
-    for file in $*; do
-        svn_status=`svn propget svn:eol-style $file`
-        if [ -z "${svn_status}" -o "${svn_status}" != "native" ]; then
+    IFS=$'\n'
+    for file in `find . -iname \*\.$1`; do
+        eolstyle=`svn propget svn:eol-style $file`
+        if [ -z "${eolstyle}" -o "${eolstyle}" != "native" ]; then
             svn propset svn:eol-style native $file
         fi
     done
 }
 
-for file in `find OpenSim -name \*\.cs`; do
-    set_eol_style $file
+EXTENSIONS="cs ini example txt sql"
+
+for ext in ${EXTENSIONS}; do
+    set_eol_style $ext
 done
diff --git a/share/RegionLoading/HOWTO_REMOTE_REGION_LOADING.txt b/share/RegionLoading/HOWTO_REMOTE_REGION_LOADING.txt
index f3afd43..75afcdf 100644
--- a/share/RegionLoading/HOWTO_REMOTE_REGION_LOADING.txt
+++ b/share/RegionLoading/HOWTO_REMOTE_REGION_LOADING.txt
@@ -1,9 +1,9 @@
-The remote region loading ability allows easier management of what regions a simulator run s from a webserver.

-In OpenSim.ini, change the 'region_info_source = filesystem' under [Startup] to 'region_info_source = web'. 

-Then change the line 'regionload_webserver_url = ' to 'regionload_webserver_url = http://127.0.0.1/default.xml'

-replacing 'http://127.0.0.1/default.xml' with the URL of the region XML file.

-

-The XML file of a remote region is similar to the filesystem version, except it is in one file instead of multiple 

-region_xxx.xml files.

-

+The remote region loading ability allows easier management of what regions a simulator run s from a webserver.
+In OpenSim.ini, change the 'region_info_source = filesystem' under [Startup] to 'region_info_source = web'. 
+Then change the line 'regionload_webserver_url = ' to 'regionload_webserver_url = http://127.0.0.1/default.xml'
+replacing 'http://127.0.0.1/default.xml' with the URL of the region XML file.
+
+The XML file of a remote region is similar to the filesystem version, except it is in one file instead of multiple 
+region_xxx.xml files.
+
 See example_web.xml for an example on how to make a web version for region loading.
\ No newline at end of file