diff options
author | Melanie | 2011-10-12 00:10:15 +0200 |
---|---|---|
committer | Melanie | 2011-10-12 00:10:15 +0200 |
commit | 1c2b5d99c9601a3d301f4bc0f53389cca831ee04 (patch) | |
tree | 97fa9c758f429d5dee64234e442f2c83cd1b9994 /bin | |
parent | Merge branch 'careminster-presence-refactor' into bigmerge (diff) | |
parent | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge (diff) | |
download | opensim-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-x | bin/Npgsql.dll | bin | 267264 -> 0 bytes | |||
-rw-r--r-- | bin/OpenSim.ini.example | 40 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 61 | ||||
-rw-r--r-- | bin/Robust.HG.ini.example | 8 | ||||
-rw-r--r-- | bin/Robust.ini.example | 8 | ||||
-rw-r--r-- | bin/assets/BodyPartsAssetSet/BodyPartsAssetSet.xml | 10 | ||||
-rw-r--r-- | bin/assets/BodyPartsAssetSet/base_eyes.dat | 26 | ||||
-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.dat | 212 | ||||
-rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 7 | ||||
-rw-r--r-- | bin/assets/TexturesAssetSet/default_iris.jp2 | bin | 0 -> 15719 bytes | |||
-rw-r--r-- | bin/config-include/Standalone.ini | 8 | ||||
-rw-r--r-- | bin/inventory/TexturesLibrary/TexturesLibraryItems.xml | 10 |
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 @@ | |||
1 | LLWearable version 22 | ||
2 | New 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 | } | ||
21 | type 3 | ||
22 | parameters 2 | ||
23 | 98 0 | ||
24 | 99 0 | ||
25 | textures 1 | ||
26 | 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 | |||
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 | } |
21 | type 2 | 21 | type 2 |
22 | parameters 39 | 22 | parameters 90 |
23 | 16 0 | 23 | 16 0 |
24 | 31 .5 | 24 | 31 .5 |
25 | 112 0 | 25 | 112 0 |
@@ -38,26 +38,77 @@ parameters 39 | |||
38 | 140 0 | 38 | 140 0 |
39 | 141 0 | 39 | 141 0 |
40 | 142 0 | 40 | 142 0 |
41 | 143 .13 | 41 | 143 .12 |
42 | 144 .1 | ||
43 | 145 0 | ||
44 | 146 0 | ||
45 | 147 0 | ||
46 | 148 .22 | ||
47 | 149 0 | ||
42 | 166 0 | 48 | 166 0 |
43 | 167 0 | 49 | 167 0 |
44 | 168 0 | 50 | 168 0 |
45 | 169 0 | 51 | 169 0 |
52 | 171 0 | ||
53 | 172 .5 | ||
54 | 173 0 | ||
55 | 174 0 | ||
56 | 175 .3 | ||
57 | 176 0 | ||
46 | 177 0 | 58 | 177 0 |
59 | 178 0 | ||
60 | 179 0 | ||
61 | 180 .13 | ||
47 | 181 .14 | 62 | 181 .14 |
48 | 182 .7 | 63 | 182 .7 |
49 | 183 .05 | 64 | 183 .05 |
50 | 184 0 | 65 | 184 0 |
66 | 190 0 | ||
67 | 191 0 | ||
51 | 192 0 | 68 | 192 0 |
69 | 400 .75 | ||
70 | 640 0 | ||
71 | 641 0 | ||
72 | 642 0 | ||
73 | 643 0 | ||
74 | 644 0 | ||
75 | 645 0 | ||
52 | 674 -.3 | 76 | 674 -.3 |
53 | 750 .7 | 77 | 750 .7 |
78 | 751 0 | ||
54 | 752 .5 | 79 | 752 .5 |
55 | 754 0 | 80 | 754 0 |
56 | 755 .05 | 81 | 755 .05 |
57 | 757 -1 | 82 | 757 -1 |
83 | 761 0 | ||
58 | 762 0 | 84 | 762 0 |
59 | 763 .55 | 85 | 763 .55 |
86 | 771 0 | ||
87 | 774 0 | ||
88 | 782 0 | ||
89 | 783 0 | ||
90 | 784 0 | ||
60 | 785 0 | 91 | 785 0 |
92 | 786 0 | ||
93 | 787 0 | ||
94 | 788 0 | ||
61 | 789 0 | 95 | 789 0 |
96 | 790 0 | ||
97 | 870 -.29 | ||
98 | 871 0 | ||
99 | 872 .25 | ||
100 | 1000 .5 | ||
101 | 1001 .5 | ||
102 | 1002 .7 | ||
103 | 1003 .7 | ||
104 | 1004 0 | ||
105 | 1005 0 | ||
106 | 1006 0 | ||
107 | 1007 0 | ||
108 | 1008 0 | ||
109 | 1009 0 | ||
110 | 1010 0 | ||
111 | 1011 0 | ||
112 | 1012 .25 | ||
62 | textures 1 | 113 | textures 1 |
63 | 4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b | 114 | 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 @@ | |||
1 | LLWearable version 22 | 1 | LLWearable version 22 |
2 | Female Shape and Outfit 3 Shape | 2 | New Shape |
3 | Created 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 | } |
21 | type 0 | 21 | type 0 |
22 | parameters 82 | 22 | parameters 142 |
23 | 1 .21 | 23 | 1 0 |
24 | 2 -.5 | 24 | 2 0 |
25 | 4 -.11 | 25 | 4 0 |
26 | 5 -.1 | 26 | 5 0 |
27 | 6 -.3 | 27 | 6 0 |
28 | 7 -.4 | 28 | 7 0 |
29 | 8 -.5 | 29 | 8 0 |
30 | 10 .7 | 30 | 10 0 |
31 | 11 .34 | 31 | 11 0 |
32 | 12 -.5 | 32 | 12 0 |
33 | 13 0 | 33 | 13 0 |
34 | 14 .04 | 34 | 14 0 |
35 | 15 .58 | 35 | 15 0 |
36 | 17 .56 | 36 | 17 0 |
37 | 18 -.26 | 37 | 18 0 |
38 | 19 -.73 | 38 | 19 0 |
39 | 20 -.34 | 39 | 20 0 |
40 | 21 -.01 | 40 | 21 0 |
41 | 22 1 | 41 | 22 0 |
42 | 23 -.5 | 42 | 23 0 |
43 | 24 -.63 | 43 | 24 0 |
44 | 25 .44 | 44 | 25 0 |
45 | 27 .05 | 45 | 26 0 |
46 | 33 -.24 | 46 | 27 0 |
47 | 34 -.7 | 47 | 28 0 |
48 | 35 -.16 | 48 | 29 .12 |
49 | 36 -.2 | 49 | 30 .12 |
50 | 37 -.98 | 50 | 32 0 |
51 | 38 -.5 | 51 | 33 0 |
52 | 34 0 | ||
53 | 35 0 | ||
54 | 36 -.5 | ||
55 | 37 0 | ||
56 | 38 0 | ||
57 | 40 0 | ||
52 | 80 0 | 58 | 80 0 |
53 | 105 .07 | 59 | 100 0 |
54 | 155 -.22 | 60 | 104 0 |
61 | 105 .5 | ||
62 | 106 0 | ||
63 | 151 0 | ||
64 | 152 0 | ||
65 | 153 0 | ||
66 | 155 0 | ||
67 | 156 0 | ||
55 | 157 0 | 68 | 157 0 |
56 | 185 -1 | 69 | 185 0 |
57 | 193 .86 | 70 | 186 0 |
58 | 196 -.74 | 71 | 187 0 |
59 | 505 .65 | 72 | 188 0 |
60 | 506 .12 | 73 | 189 0 |
61 | 507 -1.5 | 74 | 193 .5 |
75 | 194 .67 | ||
76 | 195 .33 | ||
77 | 196 0 | ||
78 | 505 .5 | ||
79 | 506 0 | ||
80 | 507 0 | ||
62 | 515 0 | 81 | 515 0 |
63 | 517 .16 | 82 | 517 0 |
64 | 518 .8 | 83 | 518 0 |
65 | 629 0 | 84 | 626 0 |
85 | 627 0 | ||
86 | 629 .5 | ||
87 | 630 0 | ||
88 | 631 0 | ||
89 | 633 0 | ||
90 | 634 0 | ||
91 | 635 0 | ||
66 | 637 0 | 92 | 637 0 |
67 | 646 .4 | 93 | 646 0 |
68 | 647 1 | 94 | 647 0 |
69 | 649 .36 | 95 | 648 0 |
70 | 650 .85 | 96 | 649 .5 |
71 | 652 .49 | 97 | 650 0 |
72 | 653 -1 | 98 | 651 0 |
99 | 652 .5 | ||
100 | 653 0 | ||
101 | 655 -.08 | ||
73 | 656 0 | 102 | 656 0 |
74 | 659 .65 | 103 | 657 0 |
104 | 658 0 | ||
105 | 659 .5 | ||
106 | 660 0 | ||
107 | 661 0 | ||
75 | 662 .5 | 108 | 662 .5 |
76 | 663 0 | 109 | 663 0 |
77 | 664 0 | 110 | 664 0 |
78 | 665 0 | 111 | 665 0 |
79 | 675 -.15 | 112 | 675 0 |
80 | 676 .26 | 113 | 676 0 |
81 | 678 .28 | 114 | 677 0 |
82 | 682 .27 | 115 | 678 .5 |
83 | 683 -.19 | 116 | 679 -.08 |
84 | 684 -.09 | 117 | 680 -.08 |
118 | 681 -.08 | ||
119 | 682 .5 | ||
120 | 683 -.15 | ||
121 | 684 0 | ||
85 | 685 0 | 122 | 685 0 |
86 | 690 .45 | 123 | 686 0 |
87 | 692 .4 | 124 | 687 0 |
88 | 693 -0 | 125 | 688 0 |
89 | 753 -.5 | 126 | 689 0 |
90 | 756 -.08 | 127 | 690 .5 |
91 | 758 .24 | 128 | 691 0 |
92 | 759 .6 | 129 | 692 0 |
93 | 760 .11 | 130 | 693 .6 |
94 | 764 -.38 | 131 | 694 -.08 |
95 | 765 -.3 | 132 | 695 0 |
96 | 769 .42 | 133 | 753 0 |
97 | 773 .51 | 134 | 756 0 |
98 | 795 .16 | 135 | 758 0 |
99 | 796 .11 | 136 | 759 .5 |
100 | 799 .36 | 137 | 760 0 |
138 | 764 0 | ||
139 | 765 0 | ||
140 | 767 0 | ||
141 | 768 0 | ||
142 | 769 .5 | ||
143 | 770 0 | ||
144 | 772 0 | ||
145 | 773 .5 | ||
146 | 794 .17 | ||
147 | 795 .25 | ||
148 | 796 0 | ||
149 | 797 0 | ||
150 | 798 0 | ||
151 | 799 .5 | ||
101 | 841 0 | 152 | 841 0 |
102 | 842 -.82 | 153 | 842 0 |
154 | 843 0 | ||
155 | 853 0 | ||
156 | 854 0 | ||
157 | 855 0 | ||
103 | 879 0 | 158 | 879 0 |
104 | 880 0 | 159 | 880 0 |
160 | 1103 0 | ||
161 | 1104 0 | ||
162 | 1105 0 | ||
163 | 1200 0 | ||
164 | 1201 0 | ||
105 | textures 0 | 165 | 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 @@ | |||
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> |