13 files changed, 337 insertions, 112 deletions

diff --git a/bin/Npgsql.dll b/bin/Npgsql.dll
deleted file mode 100755
index 33fe6d3..0000000
--- a/bin/Npgsql.dll
+++ /dev/null
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 342bce6..c3d3216 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -71,6 +71,11 @@
     ;; in a <Regions> tag.
     ; regionload_webserver_url = "http://example.com/regions.xml";
 
+    ;# {allow_regionless} {} {Allow simulator to start up with no regions configured.} {true false} false
+    ;; Allow the simulator to start up if there are no region configuration available
+    ;; from the selected region_info_source.
+    ; allow_regionless = false
+
     ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
     ;; Maximum size for non-physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
     ; NonPhysicalPrimMax = 256
@@ -149,14 +154,13 @@
 
     ;; Choose one of the physics engines below
     ;; OpenDynamicsEngine is by some distance the most developed physics engine
-    ;; basicphysics effectively does not model physics at all, making all
-    ;; objects phantom
-    ;; The Bullet plugins do not work properly right now.  A better Bullet plugin is on the way.
+    ;; BulletSim is incomplete and experimental but in active development
+    ;; basicphysics effectively does not model physics at all, making all objects phantom
     ;; Default is OpenDynamicsEngine
     ; physics = OpenDynamicsEngine
+    ; physics = BulletSim
     ; physics = basicphysics
     ; physics = POS
-    ; physics = modified_BulletX
 
     ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by space} {} DefaultPermissionsModule
     ;; Permission modules to use, separated by space.
@@ -219,6 +223,13 @@
     ;; server to send mail through.
     ; emailmodule = DefaultEmailModule
 
+    ; Controls whether previously compiled scripts are deleted on sim restart. If you disable this 
+    ; then startup will be faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
+    ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
+    ; by scripts have changed.
+    ; Default is false
+    ; DeleteScriptsOnStartup = true
+
 
 [SMTP]
     ;; The SMTP server enabled the email module to send email to external
@@ -589,6 +600,25 @@
     ;; VeryHigh, Severe
     OSFunctionThreatLevel = VeryLow
 
+    ; OS Functions enable/disable
+    ; For each function, you can add one line, as shown
+    ; The default for all functions allows them if below threat level
+
+    ; true allows the use of the function unconditionally
+    ; Allow_osSetRegionWaterHeight = true
+    
+    ; false disables the function completely
+    ; Allow_osSetRegionWaterHeight = false
+    
+    ; Comma separated list of UUIDS allows the function for that list of UUIDS
+    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
+
+    ; You can also use script creators as the uuid
+    ; Creators_osSetRegionWaterHeight = <uuid>, ...
+
+    ; If both Allow_ and Creators_ are given, effective permissions
+    ; are the union of the two.
+
     ;; Time a script can spend in an event handler before it is interrupted
     ; EventLimit = 30
 
@@ -740,7 +770,7 @@
     ;; "config-include/StandaloneCommon.ini.example" to "config-include/StandaloneCommon.ini" before
     ;; editing it to set the database and backend services that OpenSim will use.
     ;;
-    Include-Architecture = "config-include/Standalone.ini"
+    ; Include-Architecture = "config-include/Standalone.ini"
     ; Include-Architecture = "config-include/StandaloneHypergrid.ini"
     ; Include-Architecture = "config-include/Grid.ini"
     ; Include-Architecture = "config-include/GridHypergrid.ini"
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ca4fbfb..cd69e2a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -70,6 +70,10 @@
     ; except that everything is also enclosed in a <Regions> tag.
     ; regionload_webserver_url = "http://example.com/regions.xml";
 
+    ;; Allow the simulator to start up if there are no region configuration available
+    ;; from the selected region_info_source.
+    allow_regionless = false
+
     ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
     NonPhysicalPrimMax = 256
 
@@ -511,6 +515,7 @@
         ; so it is disabled by default.
     Cap_WebFetchInventoryDescendents = ""
 
+
 [Chat]
     ; Controls whether the chat module is enabled.  Default is true.
     enabled = true;
@@ -524,6 +529,7 @@
     ; Distance in meters that shouts should travel.  Default is 100m
     shout_distance = 100
 
+
 [EntityTransfer]
     ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
     ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
@@ -550,6 +556,12 @@
     CoalesceMultipleObjectsToInventory = true
 
 
+[Attachments]
+    ; Controls whether avatar attachments are enabled.
+    ; Defaults to true - only set to false for debugging purposes
+    Enabled = true
+
+
 [Mesh]
     ; enable / disable Collada mesh support
     ; default is true
@@ -1124,6 +1136,25 @@
     ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
     OSFunctionThreatLevel = VeryLow
 
+    ; OS Functions enable/disable
+    ; For each function, you can add one line, as shown
+    ; The default for all functions allows them if below threat level
+
+    ; true allows the use of the function unconditionally
+    ; Allow_osSetRegionWaterHeight = true
+
+    ; false disables the function completely
+    ; Allow_osSetRegionWaterHeight = false
+
+    ; Comma separated list of UUIDS allows the function for that list of UUIDS
+    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
+
+    ; You can also use script creators as the uuid
+    ; Creators_osSetRegionWaterHeight = <uuid>, ...
+
+    ; If both Allow_ and Creators_ are given, effective permissions
+    ; are the union of the two.
+
     ; Interval (s) between background save of script states
     SaveInterval = 120
 
@@ -1151,25 +1182,6 @@
     SensorMaxRange = 96.0
     SensorMaxResults = 16
 
-    ; OS Functions enable/disable
-    ; For each function, you can add one line, as shown
-    ; The default for all functions allows them if below threat level
-
-    ; true allows the use of the function unconditionally
-    ; Allow_osSetRegionWaterHeight = true
-
-    ; false disables the function completely
-    ; Allow_osSetRegionWaterHeight = false
-
-    ; Comma separated list of UUIDS allows the function for that list of UUIDS
-    ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
-
-    ; You can also use script creators as the uuid
-    ; Creators_osSetRegionWaterHeight = <uuid>, ...
-
-    ; If both Allow_ and Creators_ are given, effective permissions
-    ; are the union of the two.
-
     ; Allow for llCreateLink and llBreakLink to work without asking for permission
     ; only enable this in a trusted environment otherwise you may be subject to hijacking
     ; AutomaticLinkPermission = false
@@ -1182,11 +1194,12 @@
     ;; Path to script assemblies 
     ; ScriptEnginesPath = "ScriptEngines"
 
-    ; Whether to delete previously compiled scripts when the sim starts. If you disable this
-    ; then startup will be faster. However, then it becomes your responsibility to delete the
-    ; compiled scripts if OpenSim has changed enough that previously compiled scripts are no
-    ; longer compatible.
-    DeleteScriptsOnStartup = true 
+    ; Controls whether previously compiled scripts are deleted on sim restart. If you disable this 
+    ; then startup will be faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the 
+    ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
+    ; by scripts have changed.
+    ; Default is false
+    ; DeleteScriptsOnStartup = true
 
 
 [OpenGridProtocol]
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 910ba02..7f2636c 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -166,6 +166,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    ; AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 
+    ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
+    ;; Default is false
+    ;; If you enable this you will also need to uncomment the AvatarService line above
+    ; CreateDefaultAvatarEntries = false
+
 
 [GridUserService]
     ; for the server connector
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index f7781ab..a299a73 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -149,6 +149,14 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    ; AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 
+    ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
+    ;; Default is false
+    ;; If you enable this you will also need to uncomment the AvatarService line above
+    ; CreateDefaultAvatarEntries = false
+
 
 [GridUserService]
     ; for the server connector
diff --git a/bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml b/bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml
index 8ef0fe7..a3d7ba3 100644
--- a/bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml
+++ b/bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml
@@ -4,7 +4,7 @@
     <Key Name="assetID" Value="d342e6c0-b9d2-11dc-95ff-0800200c9a66"/>
     <Key Name="name" Value="Hair"/>
     <Key Name="assetType" Value="13" />
-    <Key Name="fileName" Value="newhair.dat"/>
+    <Key Name="fileName" Value="base_hair.dat"/>
   </Section>
 
   <Section Name="Skin">
@@ -34,6 +34,14 @@
     <Key Name="assetType" Value="13" />
     <Key Name="fileName" Value="base_shape.dat"/>
   </Section>
+
+  <Section Name="Eyes">
+    <Key Name="assetID" Value="4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7"/>
+    <Key Name="name" Value="Eyes"/>
+    <Key Name="assetType" Value="13" />
+    <Key Name="fileName" Value="base_eyes.dat"/>
+  </Section>
+
 <!--
   <Section Name="Jim Shape">
     <Key Name="assetID" Value="66c41e39-38f9-f75a-024e-585989bfab74"/>
diff --git a/bin/assets/BodyPartsAssetSet/base_eyes.dat b/bin/assets/BodyPartsAssetSet/base_eyes.dat
new file mode 100644
index 0000000..520157c
--- /dev/null
+++ b/bin/assets/BodyPartsAssetSet/base_eyes.dat
@@ -0,0 +1,26 @@
+LLWearable version 22
+New Eyes
+
+        permissions 0
+        {
+                base_mask       7fffffff
+                owner_mask      7fffffff
+                group_mask      00000000
+                everyone_mask   00000000
+                next_owner_mask 00082000
+                creator_id      11111111-1111-0000-0000-000100bba000
+                owner_id        11111111-1111-0000-0000-000100bba000
+                last_owner_id   00000000-0000-0000-0000-000000000000
+                group_id        00000000-0000-0000-0000-000000000000
+        }
+        sale_info       0
+        {
+                sale_type       not
+                sale_price      10
+        }
+type 3
+parameters 2
+98 0
+99 0
+textures 1
+3 6522e74d-1660-4e7f-b601-6f48c1659a77
diff --git a/bin/assets/BodyPartsAssetSet/newhair.dat b/bin/assets/BodyPartsAssetSet/base_hair.dat
index 3c5a8c9..05e21d8 100644
--- a/bin/assets/BodyPartsAssetSet/newhair.dat
+++ b/bin/assets/BodyPartsAssetSet/base_hair.dat
@@ -8,8 +8,8 @@ New Hair
                 group_mask      00000000
                 everyone_mask   00000000
                 next_owner_mask 00082000
-                creator_id      a52db6d0-e96c-4454-85e5-3523722daa25
-                owner_id        a52db6d0-e96c-4454-85e5-3523722daa25
+                creator_id      11111111-1111-0000-0000-000100bba000
+                owner_id        11111111-1111-0000-0000-000100bba000
                 last_owner_id   00000000-0000-0000-0000-000000000000
                 group_id        00000000-0000-0000-0000-000000000000
         }
@@ -19,7 +19,7 @@ New Hair
                 sale_price      10
         }
 type 2
-parameters 39
+parameters 90
 16 0
 31 .5
 112 0
@@ -38,26 +38,77 @@ parameters 39
 140 0
 141 0
 142 0
-143 .13
+143 .12
+144 .1
+145 0
+146 0
+147 0
+148 .22
+149 0
 166 0
 167 0
 168 0
 169 0
+171 0
+172 .5
+173 0
+174 0
+175 .3
+176 0
 177 0
+178 0
+179 0
+180 .13
 181 .14
 182 .7
 183 .05
 184 0
+190 0
+191 0
 192 0
+400 .75
+640 0
+641 0
+642 0
+643 0
+644 0
+645 0
 674 -.3
 750 .7
+751 0
 752 .5
 754 0
 755 .05
 757 -1
+761 0
 762 0
 763 .55
+771 0
+774 0
+782 0
+783 0
+784 0
 785 0
+786 0
+787 0
+788 0
 789 0
+790 0
+870 -.29
+871 0
+872 .25
+1000 .5
+1001 .5
+1002 .7
+1003 .7
+1004 0
+1005 0
+1006 0
+1007 0
+1008 0
+1009 0
+1010 0
+1011 0
+1012 .25
 textures 1
 4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b
diff --git a/bin/assets/BodyPartsAssetSet/base_shape.dat b/bin/assets/BodyPartsAssetSet/base_shape.dat
index d9a361f..bf719c9 100644
--- a/bin/assets/BodyPartsAssetSet/base_shape.dat
+++ b/bin/assets/BodyPartsAssetSet/base_shape.dat
@@ -1,105 +1,165 @@
 LLWearable version 22
-Female Shape and Outfit 3 Shape
-Created by system from avatar's appearance.
+New Shape
+
         permissions 0
         {
-                base_mask       00000000
-                owner_mask      00000000
+                base_mask       7fffffff
+                owner_mask      7fffffff
                 group_mask      00000000
                 everyone_mask   00000000
-                next_owner_mask 00000000
+                next_owner_mask 00082000
                 creator_id      11111111-1111-0000-0000-000100bba000
                 owner_id        11111111-1111-0000-0000-000100bba000
-                last_owner_id   11111111-1111-0000-0000-000100bba000
+                last_owner_id   00000000-0000-0000-0000-000000000000
                 group_id        00000000-0000-0000-0000-000000000000
         }
         sale_info       0
         {
                 sale_type       not
-                sale_price      0
+                sale_price      10
         }
 type 0
-parameters 82
-1 .21
-2 -.5
-4 -.11
-5 -.1
-6 -.3
-7 -.4
-8 -.5
-10 .7
-11 .34
-12 -.5
+parameters 142
+1 0
+2 0
+4 0
+5 0
+6 0
+7 0
+8 0
+10 0
+11 0
+12 0
 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
+14 0
+15 0
+17 0
+18 0
+19 0
+20 0
+21 0
+22 0
+23 0
+24 0
+25 0
+26 0
+27 0
+28 0
+29 .12
+30 .12
+32 0
+33 0
+34 0
+35 0
+36 -.5
+37 0
+38 0
+40 0
 80 0
-105 .07
-155 -.22
+100 0
+104 0
+105 .5
+106 0
+151 0
+152 0
+153 0
+155 0
+156 0
 157 0
-185 -1
-193 .86
-196 -.74
-505 .65
-506 .12
-507 -1.5
+185 0
+186 0
+187 0
+188 0
+189 0
+193 .5
+194 .67
+195 .33
+196 0
+505 .5
+506 0
+507 0
 515 0
-517 .16
-518 .8
-629 0
+517 0
+518 0
+626 0
+627 0
+629 .5
+630 0
+631 0
+633 0
+634 0
+635 0
 637 0
-646 .4
-647 1
-649 .36
-650 .85
-652 .49
-653 -1
+646 0
+647 0
+648 0
+649 .5
+650 0
+651 0
+652 .5
+653 0
+655 -.08
 656 0
-659 .65
+657 0
+658 0
+659 .5
+660 0
+661 0
 662 .5
 663 0
 664 0
 665 0
-675 -.15
-676 .26
-678 .28
-682 .27
-683 -.19
-684 -.09
+675 0
+676 0
+677 0
+678 .5
+679 -.08
+680 -.08
+681 -.08
+682 .5
+683 -.15
+684 0
 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
+686 0
+687 0
+688 0
+689 0
+690 .5
+691 0
+692 0
+693 .6
+694 -.08
+695 0
+753 0
+756 0
+758 0
+759 .5
+760 0
+764 0
+765 0
+767 0
+768 0
+769 .5
+770 0
+772 0
+773 .5
+794 .17
+795 .25
+796 0
+797 0
+798 0
+799 .5
 841 0
-842 -.82
+842 0
+843 0
+853 0
+854 0
+855 0
 879 0
 880 0
+1103 0
+1104 0
+1105 0
+1200 0
+1201 0
 textures 0
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index 3af9c99..ecf2005 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -430,6 +430,13 @@
     <Key Name="fileName" Value="default_avatar.jp2" />
   </Section>
 
+  <Section Name="Default Iris">
+    <Key Name="assetID" Value="6522e74d-1660-4e7f-b601-6f48c1659a77"/>
+    <Key Name="name" Value="Default Iris"/>
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="default_iris.jp2" />
+  </Section>
+
   <Section Name="Cypress 1">
      <Key Name="assetID" Value="fb2ae204-3fd1-df33-594f-c9f882830e66"/>
      <Key Name="name" Value="Cypress 1"/>
diff --git a/bin/assets/TexturesAssetSet/default_iris.jp2 b/bin/assets/TexturesAssetSet/default_iris.jp2
new file mode 100644
index 0000000..b932a06
--- /dev/null
+++ b/bin/assets/TexturesAssetSet/default_iris.jp2
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index bf89d0b..6ad4ac9 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -17,12 +17,12 @@
     AvatarServices          = "LocalAvatarServicesConnector"
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
-        MapImageService                 = "MapImageServiceModule"
+    MapImageService                     = "MapImageServiceModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
     GridInfoServiceInConnector = true
-        MapImageServiceInConnector = true
+    MapImageServiceInConnector = true
 
 [Profile]
     Module = "BasicProfileModule"
@@ -70,6 +70,10 @@
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
+
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
+    CreateDefaultAvatarEntries = true
 
 [GridUserService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
index a018a0d..9b5080d 100644
--- a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
+++ b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
@@ -561,4 +561,14 @@
     <Key Name="assetType" Value="0" />
     <Key Name="inventoryType" Value="0" />
   </Section>
+
+  <Section Name="Default Iris Texture">
+    <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000013"/>
+    <Key Name="assetID" Value="6522e74d-1660-4e7f-b601-6f48c1659a77"/>
+    <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
+    <Key Name="description" Value=""/>
+    <Key Name="name" Value="Default Iris Texture" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="inventoryType" Value="0" />
+  </Section>
 </Nini>