aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2011-10-12 00:10:15 +0200
committerMelanie2011-10-12 00:10:15 +0200
commit1c2b5d99c9601a3d301f4bc0f53389cca831ee04 (patch)
tree97fa9c758f429d5dee64234e442f2c83cd1b9994 /bin
parentMerge branch 'careminster-presence-refactor' into bigmerge (diff)
parentMerge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge (diff)
downloadopensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.zip
opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.gz
opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.bz2
opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.xz
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'bin')
-rwxr-xr-xbin/Npgsql.dllbin267264 -> 0 bytes
-rw-r--r--bin/OpenSim.ini.example40
-rw-r--r--bin/OpenSimDefaults.ini61
-rw-r--r--bin/Robust.HG.ini.example8
-rw-r--r--bin/Robust.ini.example8
-rw-r--r--bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml10
-rw-r--r--bin/assets/BodyPartsAssetSet/base_eyes.dat26
-rw-r--r--bin/assets/BodyPartsAssetSet/base_hair.dat (renamed from bin/assets/BodyPartsAssetSet/newhair.dat)59
-rw-r--r--bin/assets/BodyPartsAssetSet/base_shape.dat212
-rw-r--r--bin/assets/TexturesAssetSet/TexturesAssetSet.xml7
-rw-r--r--bin/assets/TexturesAssetSet/default_iris.jp2bin0 -> 15719 bytes
-rw-r--r--bin/config-include/Standalone.ini8
-rw-r--r--bin/inventory/TexturesLibrary/TexturesLibraryItems.xml10
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
Binary files differ
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 @@
71 ;; in a <Regions> tag. 71 ;; in a <Regions> tag.
72 ; regionload_webserver_url = "http://example.com/regions.xml"; 72 ; regionload_webserver_url = "http://example.com/regions.xml";
73 73
74 ;# {allow_regionless} {} {Allow simulator to start up with no regions configured.} {true false} false
75 ;; Allow the simulator to start up if there are no region configuration available
76 ;; from the selected region_info_source.
77 ; allow_regionless = false
78
74 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 79 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
75 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). 80 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
76 ; NonPhysicalPrimMax = 256 81 ; NonPhysicalPrimMax = 256
@@ -149,14 +154,13 @@
149 154
150 ;; Choose one of the physics engines below 155 ;; Choose one of the physics engines below
151 ;; OpenDynamicsEngine is by some distance the most developed physics engine 156 ;; OpenDynamicsEngine is by some distance the most developed physics engine
152 ;; basicphysics effectively does not model physics at all, making all 157 ;; BulletSim is incomplete and experimental but in active development
153 ;; objects phantom 158 ;; basicphysics effectively does not model physics at all, making all objects phantom
154 ;; The Bullet plugins do not work properly right now. A better Bullet plugin is on the way.
155 ;; Default is OpenDynamicsEngine 159 ;; Default is OpenDynamicsEngine
156 ; physics = OpenDynamicsEngine 160 ; physics = OpenDynamicsEngine
161 ; physics = BulletSim
157 ; physics = basicphysics 162 ; physics = basicphysics
158 ; physics = POS 163 ; physics = POS
159 ; physics = modified_BulletX
160 164
161 ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by space} {} DefaultPermissionsModule 165 ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by space} {} DefaultPermissionsModule
162 ;; Permission modules to use, separated by space. 166 ;; Permission modules to use, separated by space.
@@ -219,6 +223,13 @@
219 ;; server to send mail through. 223 ;; server to send mail through.
220 ; emailmodule = DefaultEmailModule 224 ; emailmodule = DefaultEmailModule
221 225
226 ; Controls whether previously compiled scripts are deleted on sim restart. If you disable this
227 ; then startup will be faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
228 ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
229 ; by scripts have changed.
230 ; Default is false
231 ; DeleteScriptsOnStartup = true
232
222 233
223[SMTP] 234[SMTP]
224 ;; The SMTP server enabled the email module to send email to external 235 ;; The SMTP server enabled the email module to send email to external
@@ -589,6 +600,25 @@
589 ;; VeryHigh, Severe 600 ;; VeryHigh, Severe
590 OSFunctionThreatLevel = VeryLow 601 OSFunctionThreatLevel = VeryLow
591 602
603 ; OS Functions enable/disable
604 ; For each function, you can add one line, as shown
605 ; The default for all functions allows them if below threat level
606
607 ; true allows the use of the function unconditionally
608 ; Allow_osSetRegionWaterHeight = true
609
610 ; false disables the function completely
611 ; Allow_osSetRegionWaterHeight = false
612
613 ; Comma separated list of UUIDS allows the function for that list of UUIDS
614 ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
615
616 ; You can also use script creators as the uuid
617 ; Creators_osSetRegionWaterHeight = <uuid>, ...
618
619 ; If both Allow_ and Creators_ are given, effective permissions
620 ; are the union of the two.
621
592 ;; Time a script can spend in an event handler before it is interrupted 622 ;; Time a script can spend in an event handler before it is interrupted
593 ; EventLimit = 30 623 ; EventLimit = 30
594 624
@@ -740,7 +770,7 @@
740 ;; "config-include/StandaloneCommon.ini.example" to "config-include/StandaloneCommon.ini" before 770 ;; "config-include/StandaloneCommon.ini.example" to "config-include/StandaloneCommon.ini" before
741 ;; editing it to set the database and backend services that OpenSim will use. 771 ;; editing it to set the database and backend services that OpenSim will use.
742 ;; 772 ;;
743 Include-Architecture = "config-include/Standalone.ini" 773 ; Include-Architecture = "config-include/Standalone.ini"
744 ; Include-Architecture = "config-include/StandaloneHypergrid.ini" 774 ; Include-Architecture = "config-include/StandaloneHypergrid.ini"
745 ; Include-Architecture = "config-include/Grid.ini" 775 ; Include-Architecture = "config-include/Grid.ini"
746 ; Include-Architecture = "config-include/GridHypergrid.ini" 776 ; 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 @@
70 ; except that everything is also enclosed in a <Regions> tag. 70 ; except that everything is also enclosed in a <Regions> tag.
71 ; regionload_webserver_url = "http://example.com/regions.xml"; 71 ; regionload_webserver_url = "http://example.com/regions.xml";
72 72
73 ;; Allow the simulator to start up if there are no region configuration available
74 ;; from the selected region_info_source.
75 allow_regionless = false
76
73 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). 77 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
74 NonPhysicalPrimMax = 256 78 NonPhysicalPrimMax = 256
75 79
@@ -511,6 +515,7 @@
511 ; so it is disabled by default. 515 ; so it is disabled by default.
512 Cap_WebFetchInventoryDescendents = "" 516 Cap_WebFetchInventoryDescendents = ""
513 517
518
514[Chat] 519[Chat]
515 ; Controls whether the chat module is enabled. Default is true. 520 ; Controls whether the chat module is enabled. Default is true.
516 enabled = true; 521 enabled = true;
@@ -524,6 +529,7 @@
524 ; Distance in meters that shouts should travel. Default is 100m 529 ; Distance in meters that shouts should travel. Default is 100m
525 shout_distance = 100 530 shout_distance = 100
526 531
532
527[EntityTransfer] 533[EntityTransfer]
528 ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis 534 ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
529 ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance 535 ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
@@ -550,6 +556,12 @@
550 CoalesceMultipleObjectsToInventory = true 556 CoalesceMultipleObjectsToInventory = true
551 557
552 558
559[Attachments]
560 ; Controls whether avatar attachments are enabled.
561 ; Defaults to true - only set to false for debugging purposes
562 Enabled = true
563
564
553[Mesh] 565[Mesh]
554 ; enable / disable Collada mesh support 566 ; enable / disable Collada mesh support
555 ; default is true 567 ; default is true
@@ -1124,6 +1136,25 @@
1124 ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe 1136 ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
1125 OSFunctionThreatLevel = VeryLow 1137 OSFunctionThreatLevel = VeryLow
1126 1138
1139 ; OS Functions enable/disable
1140 ; For each function, you can add one line, as shown
1141 ; The default for all functions allows them if below threat level
1142
1143 ; true allows the use of the function unconditionally
1144 ; Allow_osSetRegionWaterHeight = true
1145
1146 ; false disables the function completely
1147 ; Allow_osSetRegionWaterHeight = false
1148
1149 ; Comma separated list of UUIDS allows the function for that list of UUIDS
1150 ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
1151
1152 ; You can also use script creators as the uuid
1153 ; Creators_osSetRegionWaterHeight = <uuid>, ...
1154
1155 ; If both Allow_ and Creators_ are given, effective permissions
1156 ; are the union of the two.
1157
1127 ; Interval (s) between background save of script states 1158 ; Interval (s) between background save of script states
1128 SaveInterval = 120 1159 SaveInterval = 120
1129 1160
@@ -1151,25 +1182,6 @@
1151 SensorMaxRange = 96.0 1182 SensorMaxRange = 96.0
1152 SensorMaxResults = 16 1183 SensorMaxResults = 16
1153 1184
1154 ; OS Functions enable/disable
1155 ; For each function, you can add one line, as shown
1156 ; The default for all functions allows them if below threat level
1157
1158 ; true allows the use of the function unconditionally
1159 ; Allow_osSetRegionWaterHeight = true
1160
1161 ; false disables the function completely
1162 ; Allow_osSetRegionWaterHeight = false
1163
1164 ; Comma separated list of UUIDS allows the function for that list of UUIDS
1165 ; Allow_osSetRegionWaterHeight = 888760cb-a3cf-43ac-8ea4-8732fd3ee2bb
1166
1167 ; You can also use script creators as the uuid
1168 ; Creators_osSetRegionWaterHeight = <uuid>, ...
1169
1170 ; If both Allow_ and Creators_ are given, effective permissions
1171 ; are the union of the two.
1172
1173 ; Allow for llCreateLink and llBreakLink to work without asking for permission 1185 ; Allow for llCreateLink and llBreakLink to work without asking for permission
1174 ; only enable this in a trusted environment otherwise you may be subject to hijacking 1186 ; only enable this in a trusted environment otherwise you may be subject to hijacking
1175 ; AutomaticLinkPermission = false 1187 ; AutomaticLinkPermission = false
@@ -1182,11 +1194,12 @@
1182 ;; Path to script assemblies 1194 ;; Path to script assemblies
1183 ; ScriptEnginesPath = "ScriptEngines" 1195 ; ScriptEnginesPath = "ScriptEngines"
1184 1196
1185 ; Whether to delete previously compiled scripts when the sim starts. If you disable this 1197 ; Controls whether previously compiled scripts are deleted on sim restart. If you disable this
1186 ; then startup will be faster. However, then it becomes your responsibility to delete the 1198 ; then startup will be faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
1187 ; compiled scripts if OpenSim has changed enough that previously compiled scripts are no 1199 ; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
1188 ; longer compatible. 1200 ; by scripts have changed.
1189 DeleteScriptsOnStartup = true 1201 ; Default is false
1202 ; DeleteScriptsOnStartup = true
1190 1203
1191 1204
1192[OpenGridProtocol] 1205[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
166 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 166 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
167 GridService = "OpenSim.Services.GridService.dll:GridService" 167 GridService = "OpenSim.Services.GridService.dll:GridService"
168 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 168 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
169 ; AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
170
171 ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
172 ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
173 ;; Default is false
174 ;; If you enable this you will also need to uncomment the AvatarService line above
175 ; CreateDefaultAvatarEntries = false
176
169 177
170[GridUserService] 178[GridUserService]
171 ; for the server connector 179 ; 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
149 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService" 149 PresenceService = "OpenSim.Services.PresenceService.dll:PresenceService"
150 GridService = "OpenSim.Services.GridService.dll:GridService" 150 GridService = "OpenSim.Services.GridService.dll:GridService"
151 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 151 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
152 ; AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
153
154 ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2
155 ;; to show a default "Ruth" avatar rather than a cloud for a newly created user.
156 ;; Default is false
157 ;; If you enable this you will also need to uncomment the AvatarService line above
158 ; CreateDefaultAvatarEntries = false
159
152 160
153[GridUserService] 161[GridUserService]
154 ; for the server connector 162 ; 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 @@
4 <Key Name="assetID" Value="d342e6c0-b9d2-11dc-95ff-0800200c9a66"/> 4 <Key Name="assetID" Value="d342e6c0-b9d2-11dc-95ff-0800200c9a66"/>
5 <Key Name="name" Value="Hair"/> 5 <Key Name="name" Value="Hair"/>
6 <Key Name="assetType" Value="13" /> 6 <Key Name="assetType" Value="13" />
7 <Key Name="fileName" Value="newhair.dat"/> 7 <Key Name="fileName" Value="base_hair.dat"/>
8 </Section> 8 </Section>
9 9
10 <Section Name="Skin"> 10 <Section Name="Skin">
@@ -34,6 +34,14 @@
34 <Key Name="assetType" Value="13" /> 34 <Key Name="assetType" Value="13" />
35 <Key Name="fileName" Value="base_shape.dat"/> 35 <Key Name="fileName" Value="base_shape.dat"/>
36 </Section> 36 </Section>
37
38 <Section Name="Eyes">
39 <Key Name="assetID" Value="4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7"/>
40 <Key Name="name" Value="Eyes"/>
41 <Key Name="assetType" Value="13" />
42 <Key Name="fileName" Value="base_eyes.dat"/>
43 </Section>
44
37<!-- 45<!--
38 <Section Name="Jim Shape"> 46 <Section Name="Jim Shape">
39 <Key Name="assetID" Value="66c41e39-38f9-f75a-024e-585989bfab74"/> 47 <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 @@
1LLWearable version 22
2New Eyes
3
4 permissions 0
5 {
6 base_mask 7fffffff
7 owner_mask 7fffffff
8 group_mask 00000000
9 everyone_mask 00000000
10 next_owner_mask 00082000
11 creator_id 11111111-1111-0000-0000-000100bba000
12 owner_id 11111111-1111-0000-0000-000100bba000
13 last_owner_id 00000000-0000-0000-0000-000000000000
14 group_id 00000000-0000-0000-0000-000000000000
15 }
16 sale_info 0
17 {
18 sale_type not
19 sale_price 10
20 }
21type 3
22parameters 2
2398 0
2499 0
25textures 1
263 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
8 group_mask 00000000 8 group_mask 00000000
9 everyone_mask 00000000 9 everyone_mask 00000000
10 next_owner_mask 00082000 10 next_owner_mask 00082000
11 creator_id a52db6d0-e96c-4454-85e5-3523722daa25 11 creator_id 11111111-1111-0000-0000-000100bba000
12 owner_id a52db6d0-e96c-4454-85e5-3523722daa25 12 owner_id 11111111-1111-0000-0000-000100bba000
13 last_owner_id 00000000-0000-0000-0000-000000000000 13 last_owner_id 00000000-0000-0000-0000-000000000000
14 group_id 00000000-0000-0000-0000-000000000000 14 group_id 00000000-0000-0000-0000-000000000000
15 } 15 }
@@ -19,7 +19,7 @@ New Hair
19 sale_price 10 19 sale_price 10
20 } 20 }
21type 2 21type 2
22parameters 39 22parameters 90
2316 0 2316 0
2431 .5 2431 .5
25112 0 25112 0
@@ -38,26 +38,77 @@ parameters 39
38140 0 38140 0
39141 0 39141 0
40142 0 40142 0
41143 .13 41143 .12
42144 .1
43145 0
44146 0
45147 0
46148 .22
47149 0
42166 0 48166 0
43167 0 49167 0
44168 0 50168 0
45169 0 51169 0
52171 0
53172 .5
54173 0
55174 0
56175 .3
57176 0
46177 0 58177 0
59178 0
60179 0
61180 .13
47181 .14 62181 .14
48182 .7 63182 .7
49183 .05 64183 .05
50184 0 65184 0
66190 0
67191 0
51192 0 68192 0
69400 .75
70640 0
71641 0
72642 0
73643 0
74644 0
75645 0
52674 -.3 76674 -.3
53750 .7 77750 .7
78751 0
54752 .5 79752 .5
55754 0 80754 0
56755 .05 81755 .05
57757 -1 82757 -1
83761 0
58762 0 84762 0
59763 .55 85763 .55
86771 0
87774 0
88782 0
89783 0
90784 0
60785 0 91785 0
92786 0
93787 0
94788 0
61789 0 95789 0
96790 0
97870 -.29
98871 0
99872 .25
1001000 .5
1011001 .5
1021002 .7
1031003 .7
1041004 0
1051005 0
1061006 0
1071007 0
1081008 0
1091009 0
1101010 0
1111011 0
1121012 .25
62textures 1 113textures 1
634 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b 1144 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 @@
1LLWearable version 22 1LLWearable version 22
2Female Shape and Outfit 3 Shape 2New Shape
3Created by system from avatar's appearance. 3
4 permissions 0 4 permissions 0
5 { 5 {
6 base_mask 00000000 6 base_mask 7fffffff
7 owner_mask 00000000 7 owner_mask 7fffffff
8 group_mask 00000000 8 group_mask 00000000
9 everyone_mask 00000000 9 everyone_mask 00000000
10 next_owner_mask 00000000 10 next_owner_mask 00082000
11 creator_id 11111111-1111-0000-0000-000100bba000 11 creator_id 11111111-1111-0000-0000-000100bba000
12 owner_id 11111111-1111-0000-0000-000100bba000 12 owner_id 11111111-1111-0000-0000-000100bba000
13 last_owner_id 11111111-1111-0000-0000-000100bba000 13 last_owner_id 00000000-0000-0000-0000-000000000000
14 group_id 00000000-0000-0000-0000-000000000000 14 group_id 00000000-0000-0000-0000-000000000000
15 } 15 }
16 sale_info 0 16 sale_info 0
17 { 17 {
18 sale_type not 18 sale_type not
19 sale_price 0 19 sale_price 10
20 } 20 }
21type 0 21type 0
22parameters 82 22parameters 142
231 .21 231 0
242 -.5 242 0
254 -.11 254 0
265 -.1 265 0
276 -.3 276 0
287 -.4 287 0
298 -.5 298 0
3010 .7 3010 0
3111 .34 3111 0
3212 -.5 3212 0
3313 0 3313 0
3414 .04 3414 0
3515 .58 3515 0
3617 .56 3617 0
3718 -.26 3718 0
3819 -.73 3819 0
3920 -.34 3920 0
4021 -.01 4021 0
4122 1 4122 0
4223 -.5 4223 0
4324 -.63 4324 0
4425 .44 4425 0
4527 .05 4526 0
4633 -.24 4627 0
4734 -.7 4728 0
4835 -.16 4829 .12
4936 -.2 4930 .12
5037 -.98 5032 0
5138 -.5 5133 0
5234 0
5335 0
5436 -.5
5537 0
5638 0
5740 0
5280 0 5880 0
53105 .07 59100 0
54155 -.22 60104 0
61105 .5
62106 0
63151 0
64152 0
65153 0
66155 0
67156 0
55157 0 68157 0
56185 -1 69185 0
57193 .86 70186 0
58196 -.74 71187 0
59505 .65 72188 0
60506 .12 73189 0
61507 -1.5 74193 .5
75194 .67
76195 .33
77196 0
78505 .5
79506 0
80507 0
62515 0 81515 0
63517 .16 82517 0
64518 .8 83518 0
65629 0 84626 0
85627 0
86629 .5
87630 0
88631 0
89633 0
90634 0
91635 0
66637 0 92637 0
67646 .4 93646 0
68647 1 94647 0
69649 .36 95648 0
70650 .85 96649 .5
71652 .49 97650 0
72653 -1 98651 0
99652 .5
100653 0
101655 -.08
73656 0 102656 0
74659 .65 103657 0
104658 0
105659 .5
106660 0
107661 0
75662 .5 108662 .5
76663 0 109663 0
77664 0 110664 0
78665 0 111665 0
79675 -.15 112675 0
80676 .26 113676 0
81678 .28 114677 0
82682 .27 115678 .5
83683 -.19 116679 -.08
84684 -.09 117680 -.08
118681 -.08
119682 .5
120683 -.15
121684 0
85685 0 122685 0
86690 .45 123686 0
87692 .4 124687 0
88693 -0 125688 0
89753 -.5 126689 0
90756 -.08 127690 .5
91758 .24 128691 0
92759 .6 129692 0
93760 .11 130693 .6
94764 -.38 131694 -.08
95765 -.3 132695 0
96769 .42 133753 0
97773 .51 134756 0
98795 .16 135758 0
99796 .11 136759 .5
100799 .36 137760 0
138764 0
139765 0
140767 0
141768 0
142769 .5
143770 0
144772 0
145773 .5
146794 .17
147795 .25
148796 0
149797 0
150798 0
151799 .5
101841 0 152841 0
102842 -.82 153842 0
154843 0
155853 0
156854 0
157855 0
103879 0 158879 0
104880 0 159880 0
1601103 0
1611104 0
1621105 0
1631200 0
1641201 0
105textures 0 165textures 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 @@
430 <Key Name="fileName" Value="default_avatar.jp2" /> 430 <Key Name="fileName" Value="default_avatar.jp2" />
431 </Section> 431 </Section>
432 432
433 <Section Name="Default Iris">
434 <Key Name="assetID" Value="6522e74d-1660-4e7f-b601-6f48c1659a77"/>
435 <Key Name="name" Value="Default Iris"/>
436 <Key Name="assetType" Value="0" />
437 <Key Name="fileName" Value="default_iris.jp2" />
438 </Section>
439
433 <Section Name="Cypress 1"> 440 <Section Name="Cypress 1">
434 <Key Name="assetID" Value="fb2ae204-3fd1-df33-594f-c9f882830e66"/> 441 <Key Name="assetID" Value="fb2ae204-3fd1-df33-594f-c9f882830e66"/>
435 <Key Name="name" Value="Cypress 1"/> 442 <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
Binary files differ
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 @@
17 AvatarServices = "LocalAvatarServicesConnector" 17 AvatarServices = "LocalAvatarServicesConnector"
18 EntityTransferModule = "BasicEntityTransferModule" 18 EntityTransferModule = "BasicEntityTransferModule"
19 InventoryAccessModule = "BasicInventoryAccessModule" 19 InventoryAccessModule = "BasicInventoryAccessModule"
20 MapImageService = "MapImageServiceModule" 20 MapImageService = "MapImageServiceModule"
21 21
22 LibraryModule = true 22 LibraryModule = true
23 LLLoginServiceInConnector = true 23 LLLoginServiceInConnector = true
24 GridInfoServiceInConnector = true 24 GridInfoServiceInConnector = true
25 MapImageServiceInConnector = true 25 MapImageServiceInConnector = true
26 26
27[Profile] 27[Profile]
28 Module = "BasicProfileModule" 28 Module = "BasicProfileModule"
@@ -70,6 +70,10 @@
70 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService" 70 GridUserService = "OpenSim.Services.UserAccountService.dll:GridUserService"
71 GridService = "OpenSim.Services.GridService.dll:GridService" 71 GridService = "OpenSim.Services.GridService.dll:GridService"
72 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService" 72 InventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
73 AvatarService = "OpenSim.Services.AvatarService.dll:AvatarService"
74
75 ;; 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.
76 CreateDefaultAvatarEntries = true
73 77
74[GridUserService] 78[GridUserService]
75 LocalServiceModule = "OpenSim.Services.UserAccountService.dll:GridUserService" 79 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 @@
561 <Key Name="assetType" Value="0" /> 561 <Key Name="assetType" Value="0" />
562 <Key Name="inventoryType" Value="0" /> 562 <Key Name="inventoryType" Value="0" />
563 </Section> 563 </Section>
564
565 <Section Name="Default Iris Texture">
566 <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000013"/>
567 <Key Name="assetID" Value="6522e74d-1660-4e7f-b601-6f48c1659a77"/>
568 <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/>
569 <Key Name="description" Value=""/>
570 <Key Name="name" Value="Default Iris Texture" />
571 <Key Name="assetType" Value="0" />
572 <Key Name="inventoryType" Value="0" />
573 </Section>
564</Nini> 574</Nini>