From 44a491f36bbe2094634e356591381c90f87e2125 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 12 Sep 2011 20:31:14 +0100
Subject: uncomment Standalone config in OpenSim.ini.example.

This is to make my life easier when creating releases.
I think that it also gives a better story for anybody newly compiling from source.
---
 bin/OpenSim.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c36d2a4..342bce6 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -740,7 +740,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"
-- 
cgit v1.1


From c4efb97d49dec736151dfa3fa102efe6a5f6fbab Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 15 Sep 2011 22:59:29 +0100
Subject: Write code to create minimum necessary body parts/clothing and avatar
 entries to make a newly created user appear as a non-cloud on viewer 2

Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries.
Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim.
Default is currently off.  My intention is to switch it on for standalone shortly.
This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities.
Need to fix creation of suitable entries for users created as estate owners on standalone.
Avatars still appear with spooky empty eyes, need to see if we can address this.
This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461) which can be used.
---
 bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml |  10 +-
 bin/assets/BodyPartsAssetSet/base_eyes.dat         |  26 +++
 bin/assets/BodyPartsAssetSet/base_hair.dat         |  26 +++
 bin/assets/BodyPartsAssetSet/base_shape.dat        | 212 +++++++++++++--------
 bin/assets/BodyPartsAssetSet/newhair.dat           |  63 ------
 bin/assets/TexturesAssetSet/TexturesAssetSet.xml   |   7 +
 bin/assets/TexturesAssetSet/default_iris.jp2       | Bin 0 -> 15719 bytes
 bin/config-include/Standalone.ini                  |   1 +
 .../TexturesLibrary/TexturesLibraryItems.xml       |  10 +
 9 files changed, 215 insertions(+), 140 deletions(-)
 create mode 100644 bin/assets/BodyPartsAssetSet/base_eyes.dat
 create mode 100644 bin/assets/BodyPartsAssetSet/base_hair.dat
 delete mode 100644 bin/assets/BodyPartsAssetSet/newhair.dat
 create mode 100644 bin/assets/TexturesAssetSet/default_iris.jp2

(limited to 'bin')

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/base_hair.dat b/bin/assets/BodyPartsAssetSet/base_hair.dat
new file mode 100644
index 0000000..520157c
--- /dev/null
+++ b/bin/assets/BodyPartsAssetSet/base_hair.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/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/BodyPartsAssetSet/newhair.dat b/bin/assets/BodyPartsAssetSet/newhair.dat
deleted file mode 100644
index 3c5a8c9..0000000
--- a/bin/assets/BodyPartsAssetSet/newhair.dat
+++ /dev/null
@@ -1,63 +0,0 @@
-LLWearable version 22
-New Hair
-
-	permissions 0
-	{
-		base_mask	7fffffff
-		owner_mask	7fffffff
-		group_mask	00000000
-		everyone_mask	00000000
-		next_owner_mask	00082000
-		creator_id	a52db6d0-e96c-4454-85e5-3523722daa25
-		owner_id	a52db6d0-e96c-4454-85e5-3523722daa25
-		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 2
-parameters 39
-16 0
-31 .5
-112 0
-113 0
-114 .5
-115 0
-119 .5
-130 .45
-131 .5
-132 .39
-133 .25
-134 .5
-135 .55
-136 .5
-137 .5
-140 0
-141 0
-142 0
-143 .13
-166 0
-167 0
-168 0
-169 0
-177 0
-181 .14
-182 .7
-183 .05
-184 0
-192 0
-674 -.3
-750 .7
-752 .5
-754 0
-755 .05
-757 -1
-762 0
-763 .55
-785 0
-789 0
-textures 1
-4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b
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
Binary files /dev/null and b/bin/assets/TexturesAssetSet/default_iris.jp2 differ
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index bf89d0b..8aaa154 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -70,6 +70,7 @@
     GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
     GridService = "OpenSim.Services.GridService.dll:GridService"
     InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
+    AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
 
 [GridUserService]
     LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService"
diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
index a018a0d..e1452f6 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="6e610cae-3b0d-4729-b482-2c31ab2e49f9"/>
+    <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>
-- 
cgit v1.1


From 37370a8102f066dab1fe3fd9b0b4a7d3541e8b47 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Sep 2011 00:30:37 +0100
Subject: On standalone, by default create the necessary minimum body parts and
 clothes necessary to display a viewer 2 avatar, as implemented in c4efb97d
 This is controlled by the CreateDefaultAvatarEntries switch in the
 [UserAccountService] section of config-include/Stnadalone.ini This is left as
 false in grid mode

---
 bin/Robust.HG.ini.example         | 8 ++++++++
 bin/Robust.ini.example            | 8 ++++++++
 bin/config-include/Standalone.ini | 7 +++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'bin')

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/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 8aaa154..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"
@@ -72,6 +72,9 @@
     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"
 
-- 
cgit v1.1


From a00327d0e5f512ccf56e18082c7e7c7366517379 Mon Sep 17 00:00:00 2001
From: justincc
Date: Fri, 16 Sep 2011 19:54:23 +0100
Subject: Fix build errors on Windows by adding missing OpenSim.Services.Base
 reference

---
 bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100755 bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config

(limited to 'bin')

diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
deleted file mode 100755
index 026417a..0000000
--- a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<configuration>
-  <dllmap os="windows" cpu="x86" dll="BulletSim" target="BulletSim" />
-  <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="BulletSim-x86_64" />
-  <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="./libBulletSim.so" />
-  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="./libBulletSim-x86_64.so" />
-</configuration>
-- 
cgit v1.1


From c38b25a1d21540fd5be4ae438b38ab67ba88d166 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Sep 2011 21:43:58 +0100
Subject: Fix base_hair.dat to actually contain the base hair asset rather than
 base eyes by mistake.

I must have had it cached last night.
This now makes completely fresh avatar setups appear properly (remember to wipe viewer cache and server cache as well as database).
As a bonus, eyes now appear by default too!
---
 bin/assets/BodyPartsAssetSet/base_hair.dat | 100 +++++++++++++++++++++++++++--
 1 file changed, 94 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/assets/BodyPartsAssetSet/base_hair.dat b/bin/assets/BodyPartsAssetSet/base_hair.dat
index 520157c..05e21d8 100644
--- a/bin/assets/BodyPartsAssetSet/base_hair.dat
+++ b/bin/assets/BodyPartsAssetSet/base_hair.dat
@@ -1,5 +1,5 @@
 LLWearable version 22
-New Eyes
+New Hair
 
 	permissions 0
 	{
@@ -18,9 +18,97 @@ New Eyes
 		sale_type	not
 		sale_price	10
 	}
-type 3
-parameters 2
-98 0
-99 0
+type 2
+parameters 90
+16 0
+31 .5
+112 0
+113 0
+114 .5
+115 0
+119 .5
+130 .45
+131 .5
+132 .39
+133 .25
+134 .5
+135 .55
+136 .5
+137 .5
+140 0
+141 0
+142 0
+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
-3 6522e74d-1660-4e7f-b601-6f48c1659a77
+4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b
-- 
cgit v1.1


From 744602f6d170373882cb31155c8c899b43a5339e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Sep 2011 00:10:19 +0100
Subject: Revert "uncomment Standalone config in OpenSim.ini.example."

This reverts commit 44a491f36bbe2094634e356591381c90f87e2125.

This makes packaging OpenSim slightly easier but then generates a FriendsConnector error if naively used after compilation.
So let's revert to stick with the "DataStore" error for now - at least that's a known error.
---
 bin/OpenSim.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 342bce6..c36d2a4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -740,7 +740,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"
-- 
cgit v1.1


From 6f69ab3bcb932589f102c16b718e7f8964d2c8eb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Sep 2011 00:49:26 +0100
Subject: Add back BulletSPlugin.dll.config that I somehow managed to delete
 today in a00327d

---
 bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100755 bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config

(limited to 'bin')

diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
new file mode 100755
index 0000000..026417a
--- /dev/null
+++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
@@ -0,0 +1,6 @@
+<configuration>
+  <dllmap os="windows" cpu="x86" dll="BulletSim" target="BulletSim" />
+  <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="BulletSim-x86_64" />
+  <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="./libBulletSim.so" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="./libBulletSim-x86_64.so" />
+</configuration>
-- 
cgit v1.1


From f95033812402aaf31a9f2f66c946165d2d79669f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Sep 2011 01:09:25 +0100
Subject: Remove old bullet DotNET and X libraries in preparation for BulletS

These weren't working properly anyway.
You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well.
---
 bin/OpenSim.ini.example | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c36d2a4..0ef6880 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -149,14 +149,11 @@
 
     ;; 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.
+    ;; basicphysics effectively does not model physics at all, making all objects phantom
     ;; Default is OpenDynamicsEngine
     ; physics = OpenDynamicsEngine
     ; 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.
-- 
cgit v1.1


From 27af016381f2f4aaa8cda99ce7f029980bf8ea76 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Sep 2011 01:13:07 +0100
Subject: Add BulletSim physics option details to OpenSim.ini.example.  Marked
 as in development and experimental.

---
 bin/OpenSim.ini.example | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 0ef6880..925c343 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -149,9 +149,11 @@
 
     ;; Choose one of the physics engines below
     ;; OpenDynamicsEngine is by some distance the most developed physics engine
+    ;; 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
 
-- 
cgit v1.1


From ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 23 Sep 2011 21:57:52 +0100
Subject: Correct asset id of library default iris texture.

For this change to show up you will need to clear viewer cache.
---
 bin/inventory/TexturesLibrary/TexturesLibraryItems.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
index e1452f6..9b5080d 100644
--- a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
+++ b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml
@@ -564,7 +564,7 @@
 
   <Section Name="Default Iris Texture">
     <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000013"/>
-    <Key Name="assetID" Value="6e610cae-3b0d-4729-b482-2c31ab2e49f9"/>
+    <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" />
-- 
cgit v1.1