From 79743492623087a6547f9dfa159017d069e92a41 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Mon, 20 Jun 2011 17:28:53 -0700 Subject: Initial BulletSim.dll commit --- bin/BulletSim.dll | Bin 0 -> 652800 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100755 bin/BulletSim.dll (limited to 'bin') diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll new file mode 100755 index 0000000..2e6501c Binary files /dev/null and b/bin/BulletSim.dll differ -- cgit v1.1 From 23bf773dea111a1c72098be657f6cd1d20eb2834 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Mon, 27 Jun 2011 00:29:01 +0100 Subject: For an initial test, add 64 bit shared object bullet libraries built under Linux. These are not yet hooked up. I'm not sure which one you actually need, Robert, so please prune as appropriate. I haven't tested or hooked these up in any way yet. --- bin/libBulletCollision.so | Bin 0 -> 5511999 bytes bin/libBulletDynamics.so | Bin 0 -> 2105118 bytes bin/libBulletSoftBody.so | Bin 0 -> 1729907 bytes bin/libLinearMath.so | Bin 0 -> 589874 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100755 bin/libBulletCollision.so create mode 100755 bin/libBulletDynamics.so create mode 100755 bin/libBulletSoftBody.so create mode 100755 bin/libLinearMath.so (limited to 'bin') diff --git a/bin/libBulletCollision.so b/bin/libBulletCollision.so new file mode 100755 index 0000000..c7bed8d Binary files /dev/null and b/bin/libBulletCollision.so differ diff --git a/bin/libBulletDynamics.so b/bin/libBulletDynamics.so new file mode 100755 index 0000000..722bf7b Binary files /dev/null and b/bin/libBulletDynamics.so differ diff --git a/bin/libBulletSoftBody.so b/bin/libBulletSoftBody.so new file mode 100755 index 0000000..1b03e05 Binary files /dev/null and b/bin/libBulletSoftBody.so differ diff --git a/bin/libLinearMath.so b/bin/libLinearMath.so new file mode 100755 index 0000000..f7da5b2 Binary files /dev/null and b/bin/libLinearMath.so differ -- cgit v1.1 From 51d6c58d10070cb969f8acb6cd655df126a4d6b4 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Mon, 11 Jul 2011 12:23:00 -0700 Subject: Checkin 32 bit bulletsim shared library for Linux. --- bin/libBulletCollision.so | Bin 5511999 -> 0 bytes bin/libBulletDynamics.so | Bin 2105118 -> 0 bytes bin/libBulletSim.so | Bin 0 -> 1747634 bytes bin/libBulletSoftBody.so | Bin 1729907 -> 0 bytes bin/libLinearMath.so | Bin 589874 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100755 bin/libBulletCollision.so delete mode 100755 bin/libBulletDynamics.so create mode 100755 bin/libBulletSim.so delete mode 100755 bin/libBulletSoftBody.so delete mode 100755 bin/libLinearMath.so (limited to 'bin') diff --git a/bin/libBulletCollision.so b/bin/libBulletCollision.so deleted file mode 100755 index c7bed8d..0000000 Binary files a/bin/libBulletCollision.so and /dev/null differ diff --git a/bin/libBulletDynamics.so b/bin/libBulletDynamics.so deleted file mode 100755 index 722bf7b..0000000 Binary files a/bin/libBulletDynamics.so and /dev/null differ diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so new file mode 100755 index 0000000..537a5e2 Binary files /dev/null and b/bin/libBulletSim.so differ diff --git a/bin/libBulletSoftBody.so b/bin/libBulletSoftBody.so deleted file mode 100755 index 1b03e05..0000000 Binary files a/bin/libBulletSoftBody.so and /dev/null differ diff --git a/bin/libLinearMath.so b/bin/libLinearMath.so deleted file mode 100755 index f7da5b2..0000000 Binary files a/bin/libLinearMath.so and /dev/null differ -- cgit v1.1 From bf1b8397bb6a8dad5eba89b44c46412bbb948edd Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 12 Jul 2011 23:35:06 +0100 Subject: Add a warning to URI config in GridCommon.ini.example not to add a slash to the end. Tidy up GridCommon.ini.example --- bin/config-include/GridCommon.ini.example | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'bin') diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 4eb6fcf..4e34059 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -28,19 +28,19 @@ AssetLoaderArgs = "assets/AssetSets.xml" ; - ; change this to your grid-wide asset server + ; Change this to your grid-wide asset server. Do not add a slash to the end of any of these addresses. ; AssetServerURI = "http://myassetserver.com:8003" [InventoryService] ; - ; change this to your grid-wide inventory server + ; Change this to your grid-wide inventory server ; InventoryServerURI = "http://myinventoryserver.com:8003" [GridService] ; - ; change this to your grid-wide grid server + ; Change this to your grid-wide grid server ; GridServerURI = "http://mygridserver.com:8003" ;AllowHypergridMapSearch = true @@ -49,51 +49,51 @@ ; MapTileDirectory = "./maptiles" ; === HG ONLY === - ;; change this to the address of your Gatekeeper service - ;; (usually bundled with the rest of the services in one - ;; Robust server in port 8002, but not always) - Gatekeeper="http://mygridserver.com:8002" + ;; Change this to the address of your Gatekeeper service + ;; (usually bundled with the rest of the services in one + ;; Robust server in port 8002, but not always) + Gatekeeper="http://mygridserver.com:8002" [Messaging] ; === HG ONLY === - ;; change this to the address of your Gatekeeper service + ;; Change this to the address of your Gatekeeper service ;; (usually bundled with the rest of the services in one ;; Robust server in port 8002, but not always) Gatekeeper = "http://mygridserver.com:8002" [AvatarService] ; - ; change this to your grid-wide grid server + ; Change this to your grid-wide grid server ; AvatarServerURI = "http://mygridserver.com:8003" [PresenceService] ; - ; change this to your grid-wide presence server + ; Change this to your grid-wide presence server ; PresenceServerURI = "http://mygridserver.com:8003" [UserAccountService] ; - ; change this to your grid-wide user accounts server + ; Change this to your grid-wide user accounts server ; UserAccountServerURI = "http://mygridserver.com:8003" [GridUserService] ; - ; change this to your grid-wide user accounts server + ; Change this to your grid-wide user accounts server ; GridUserServerURI = "http://mygridserver.com:8003" [AuthenticationService] ; - ; change this to your grid-wide authentication server + ; Change this to your grid-wide authentication server ; AuthenticationServerURI = "http://mygridserver.com:8003" [FriendsService] ; - ; change this to your grid-wide friends server + ; Change this to your grid-wide friends server ; FriendsServerURI = "http://mygridserver.com:8003" @@ -104,10 +104,10 @@ ; accessible from other grids ; ProfileServerURI = "http://mygridserver.com:8002/user" - Gatekeeper = "http://mygridserver.com:8002" - ;; If you want to protect your assets from being copied by foreign visitors - ;; uncomment the next line. You may want to do this on sims that have licensed content. - ; OutboundPermission = False + Gatekeeper = "http://mygridserver.com:8002" + ;; If you want to protect your assets from being copied by foreign visitors + ;; uncomment the next line. You may want to do this on sims that have licensed content. + ; OutboundPermission = False [UserAgentService] ; -- cgit v1.1 From 1c758ae01c514df4742a9cdae6480e8011debf38 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:08:58 +0100 Subject: make default TextureOnMapTile true for the older map imager Don't know of a good reason not to do this, seems to work fine. --- bin/OpenSim.ini.example | 4 ++-- bin/OpenSimDefaults.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 60d37fb..b706926 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -68,9 +68,9 @@ ;; in a tag. ; regionload_webserver_url = "http://example.com/regions.xml"; - ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} false + ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true ;; Use terrain texture for maptiles if true, use shaded green if false - ; TextureOnMapTile = false + ; TextureOnMapTile = true ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false ;; Draw objects on maptile. This step might take a long time if you've diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 400d3df..ffb3063 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -71,7 +71,7 @@ ; objects, so you can turn it off here if you'd like. DrawPrimOnMapTile = true ; Use terrain texture for maptiles if true, use shaded green if false - TextureOnMapTile = false + TextureOnMapTile = true ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). NonPhysicalPrimMax = 256 -- cgit v1.1 From 69c2d3434a314b962deda9557b280718c22bab9c Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:13:54 +0100 Subject: minor: remove the pointless quotes from the GenerateMaptiles option --- 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 b706926..b21e3e2 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -190,7 +190,7 @@ ;; Map tile options. You can choose to generate no map tiles at all, ;; generate normal maptiles, or nominate an uploaded texture to ;; be the map tile - ; GenerateMaptiles = "true" + ; GenerateMaptiles = true ;; If desired, a running region can update the map tiles periodically ;; to reflect building activity. This names no sense of you don't have -- cgit v1.1 From d2d67a1abfe88e1f86e7edce279905602b8192cb Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:14:43 +0100 Subject: remove pointless quotes from GenerateMaptiles option in OpenSimDefaults.ini --- bin/OpenSimDefaults.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index ffb3063..b6b4d6b 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -216,10 +216,13 @@ ;WorldMapModule = "WorldMap" ;MapImageModule = "MapImageModule" + ; Set to false to not generate any maptiles - ;GenerateMaptiles = "true" + ;GenerateMaptiles = true + ; Refresh (in seconds) the map tile periodically ;MaptileRefresh = 0 + ; If not generating maptiles, use this static texture asset ID ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" -- cgit v1.1 From 0a09c45726a0115b34c34ecbfa5bf48dff501590 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:18:10 +0100 Subject: minor: group all the map tile options together --- bin/OpenSim.ini.example | 18 +++++++++--------- bin/OpenSimDefaults.ini | 13 +++++++------ 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index b21e3e2..acad0f3 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -68,15 +68,6 @@ ;; in a tag. ; regionload_webserver_url = "http://example.com/regions.xml"; - ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true - ;; Use terrain texture for maptiles if true, use shaded green if false - ; TextureOnMapTile = true - - ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false - ;; Draw objects on maptile. This step might take a long time if you've - ;; got a large number of objects, so you can turn it off here if you'd like. - ; DrawPrimOnMapTile = true - ;# {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 @@ -200,6 +191,15 @@ ;; If not generating maptiles, use this static texture asset ID ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" + ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true + ;; Use terrain texture for maptiles if true, use shaded green if false + ; TextureOnMapTile = true + + ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false + ;; Draw objects on maptile. This step might take a long time if you've + ;; got a large number of objects, so you can turn it off here if you'd like. + ; DrawPrimOnMapTile = true + ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required ; HttpProxy = "http://proxy.com:8080" diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index b6b4d6b..d1b3ae6 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -67,12 +67,6 @@ ; except that everything is also enclosed in a tag. ; regionload_webserver_url = "http://example.com/regions.xml"; - ; Draw objects on maptile. This step might take a long time if you've got a large number of - ; objects, so you can turn it off here if you'd like. - DrawPrimOnMapTile = true - ; Use terrain texture for maptiles if true, use shaded green if false - TextureOnMapTile = true - ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). NonPhysicalPrimMax = 256 @@ -226,6 +220,13 @@ ; If not generating maptiles, use this static texture asset ID ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" + ; Draw objects on maptile. This step might take a long time if you've got a large number of + ; objects, so you can turn it off here if you'd like. + DrawPrimOnMapTile = true + + ; Use terrain texture for maptiles if true, use shaded green if false + TextureOnMapTile = true + ; ## ; ## EMAIL MODULE ; ## -- cgit v1.1 From e1ce1067902614df732422721b8806e978a36f5f Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:21:19 +0100 Subject: make [SMTP] default comment option match actual default --- bin/OpenSim.ini.example | 2 +- bin/OpenSimDefaults.ini | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index acad0f3..2fe4db7 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -218,7 +218,7 @@ ;; The SMTP server enabled the email module to send email to external ;; destinations. - ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} true + ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} false ;; Enable sending email via SMTP ; enabled = false diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d1b3ae6..bf36228 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -277,15 +277,15 @@ [SMTP] - enabled=false - - ;enabled=true - ;internal_object_host=lsl.opensim.local - ;host_domain_header_from=127.0.0.1 - ;SMTP_SERVER_HOSTNAME=127.0.0.1 - ;SMTP_SERVER_PORT=25 - ;SMTP_SERVER_LOGIN=foo - ;SMTP_SERVER_PASSWORD=bar + enabled = false + + ;enabled = true + ;internal_object_host = lsl.opensim.local + ;host_domain_header_from = 127.0.0.1 + ;SMTP_SERVER_HOSTNAME = 127.0.0.1 + ;SMTP_SERVER_PORT = 25 + ;SMTP_SERVER_LOGIN = foo + ;SMTP_SERVER_PASSWORD = bar [Network] -- cgit v1.1 From 630e11cbe1001d858a5af9aee0047f4a99af3b98 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:22:27 +0100 Subject: remove dead MXP default symbols. The MXP code is long, long gone. --- bin/MXP.pdb | Bin 382464 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/MXP.pdb (limited to 'bin') diff --git a/bin/MXP.pdb b/bin/MXP.pdb deleted file mode 100644 index deadeef..0000000 Binary files a/bin/MXP.pdb and /dev/null differ -- cgit v1.1 From 6426492da04b48561a658382e8eba40c92cf4dd9 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 21 Jul 2011 03:24:20 +0100 Subject: remove the windows debugging symbols for the long protobuf-net --- bin/protobuf-net.pdb | Bin 331264 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bin/protobuf-net.pdb (limited to 'bin') diff --git a/bin/protobuf-net.pdb b/bin/protobuf-net.pdb deleted file mode 100644 index 9c85bdc..0000000 Binary files a/bin/protobuf-net.pdb and /dev/null differ -- cgit v1.1 From 5ffec1cd648bc8dcc333fc528707c09bb8dce27d Mon Sep 17 00:00:00 2001 From: Robert.Adams Date: Fri, 22 Jul 2011 10:22:21 -0700 Subject: Pass collisions and updates in pinned memory (saves marshaling). Fix folding feet by using collision normals. Add constraint specification. --- bin/BulletSim-x86_64.dll | Bin 0 -> 754176 bytes bin/BulletSim.dll | Bin 652800 -> 654336 bytes ...OpenSim.Region.Physics.BulletSPlugin.dll.config | 6 ++++++ bin/libBulletSim.so | Bin 1747634 -> 1734582 bytes 4 files changed, 6 insertions(+) create mode 100755 bin/BulletSim-x86_64.dll create mode 100755 bin/OpenSim.Region.Physics.BulletSPlugin.dll.config (limited to 'bin') diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll new file mode 100755 index 0000000..6370984 Binary files /dev/null and b/bin/BulletSim-x86_64.dll differ diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll index 2e6501c..2918130 100755 Binary files a/bin/BulletSim.dll and b/bin/BulletSim.dll differ diff --git a/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config new file mode 100755 index 0000000..e521493 --- /dev/null +++ b/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so index 537a5e2..56c4103 100755 Binary files a/bin/libBulletSim.so and b/bin/libBulletSim.so differ -- cgit v1.1 From 869883f2dc51f2b2210ccf8fd41f3de0c07e39fc Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Fri, 22 Jul 2011 15:23:57 -0700 Subject: BulletSim: fix buoyancy for prims. Start of configurable physics parameters. --- bin/BulletSim-x86_64.dll | Bin 754176 -> 754688 bytes bin/BulletSim.dll | Bin 654336 -> 654336 bytes bin/libBulletSim.so | Bin 1734582 -> 1734638 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll index 6370984..6e1b9f0 100755 Binary files a/bin/BulletSim-x86_64.dll and b/bin/BulletSim-x86_64.dll differ diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll index 2918130..c9f9637 100755 Binary files a/bin/BulletSim.dll and b/bin/BulletSim.dll differ diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so index 56c4103..8da2c9f 100755 Binary files a/bin/libBulletSim.so and b/bin/libBulletSim.so differ -- cgit v1.1 From 667b54f5a2a04fa5a2859397868d270eab3913f1 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 23 Jul 2011 01:59:14 +0100 Subject: Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default). Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes. --- .../AnimationsLibrary/AnimationsLibraryItems.xml | 6 - .../BodyPartsLibrary/BodyPartsLibraryItems.xml | 33 +-- .../ClothingLibrary/ClothingLibraryItems.xml | 14 +- .../GesturesLibrary/GesturesLibraryItems.xml | 80 ++---- .../LandmarksLibrary/LandmarksLibraryItems.xml | 4 - .../NotecardsLibrary/NotecardsLibraryItems.xml | 14 +- .../ObjectsLibrary/ObjectsLibraryItems.xml | 4 - bin/inventory/OpenSimLibrary/OpenSimLibrary.xml | 4 - bin/inventory/PhotosLibrary/PhotosLibraryItems.xml | 4 - .../ScriptsLibrary/ScriptsLibraryItems.xml | 223 +++++------------ bin/inventory/SoundsLibrary/SoundsLibraryItems.xml | 4 - .../TexturesLibrary/TexturesLibraryItems.xml | 274 ++++----------------- 12 files changed, 126 insertions(+), 538 deletions(-) (limited to 'bin') diff --git a/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml b/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml index 2a6ceb4..9cfadf0 100644 --- a/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml +++ b/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml @@ -108,8 +108,6 @@ - - diff --git a/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml b/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml index aa8d9d9..d9adf1c 100644 --- a/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml +++ b/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> + diff --git a/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml b/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml index 9e297f0..a12bb8a 100644 --- a/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml +++ b/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> + diff --git a/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml b/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml index 1312129..ca3ce2d 100644 --- a/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml +++ b/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml @@ -7,11 +7,8 @@ - - - - +
@@ -20,11 +17,8 @@ - - - -
+
@@ -33,11 +27,8 @@ - - - -
+
@@ -46,11 +37,8 @@ - - - -
+
@@ -59,11 +47,8 @@ - - - -
+
@@ -72,11 +57,8 @@ - - - -
+
@@ -85,11 +67,8 @@ - - - -
+
@@ -98,11 +77,8 @@ - - - -
+
@@ -111,11 +87,8 @@ - - - -
+
@@ -124,11 +97,8 @@ - - - -
+
@@ -137,11 +107,8 @@ - - - -
+
@@ -150,11 +117,8 @@ - - - -
+
@@ -163,11 +127,8 @@ - - - -
+
@@ -176,11 +137,8 @@ - - - -
+
@@ -189,11 +147,8 @@ - - - -
+
@@ -202,9 +157,6 @@ - - - -
+ diff --git a/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml b/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml index 4047a58..44194cd 100644 --- a/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml +++ b/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> diff --git a/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml b/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml index 713c365..e232bcc 100644 --- a/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml +++ b/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> @@ -24,11 +20,8 @@ - - - - +
@@ -37,9 +30,6 @@ - - - -
+ diff --git a/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml b/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml index 4047a58..44194cd 100644 --- a/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml +++ b/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> diff --git a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml index 7eb8de3..bef59d8 100644 --- a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml +++ b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml @@ -10,10 +10,6 @@ - - - - --> diff --git a/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml b/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml index 4047a58..44194cd 100644 --- a/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml +++ b/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> diff --git a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml index 9641f7d..df9d867 100644 --- a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml +++ b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml @@ -25,11 +25,8 @@ - - - - +
@@ -38,11 +35,8 @@ - - - -
+
@@ -51,11 +45,8 @@ - - - -
+
@@ -64,11 +55,8 @@ - - - -
+
@@ -77,11 +65,8 @@ - - - -
+
@@ -90,11 +75,8 @@ - - - -
+
@@ -103,11 +85,8 @@ - - - -
+
@@ -116,11 +95,8 @@ - - - -
+
@@ -129,11 +105,8 @@ - - - -
+
@@ -142,11 +115,8 @@ - - - -
+
@@ -155,11 +125,8 @@ - - - -
+
@@ -169,11 +136,8 @@ - - - -
+ @@ -187,6 +151,7 @@ +
@@ -195,11 +160,8 @@ - - - -
+
@@ -208,11 +170,8 @@ - - - -
+
@@ -221,11 +180,8 @@ - - - -
+
@@ -234,11 +190,8 @@ - - - -
+
@@ -248,11 +201,8 @@ - - - -
+
@@ -261,11 +211,8 @@ - - - -
+
@@ -274,11 +221,8 @@ - - - -
+ @@ -288,213 +232,166 @@
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+ +
@@ -503,11 +400,8 @@ - - - -
+
@@ -516,11 +410,8 @@ - - - -
+
@@ -529,9 +420,5 @@ - - - -
diff --git a/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml b/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml index 4047a58..44194cd 100644 --- a/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml +++ b/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml index adba99a..a018a0d 100644 --- a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml +++ b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> @@ -24,11 +20,8 @@ - - - - +
@@ -37,11 +30,8 @@ - - - -
+
@@ -50,11 +40,8 @@ - - - -
+
@@ -63,11 +50,8 @@ - - - -
+
@@ -76,11 +60,8 @@ - - - -
+
@@ -89,11 +70,8 @@ - - - -
+
@@ -102,11 +80,8 @@ - - - -
+
@@ -115,11 +90,8 @@ - - - -
+
@@ -128,11 +100,8 @@ - - - -
+
@@ -141,11 +110,8 @@ - - - -
+
@@ -154,11 +120,8 @@ - - - -
+
@@ -167,11 +130,8 @@ - - - -
+
@@ -180,11 +140,8 @@ - - - -
+
@@ -193,11 +150,8 @@ - - - -
+
@@ -206,11 +160,8 @@ - - - -
+
@@ -219,11 +170,8 @@ - - - -
+
@@ -232,11 +180,8 @@ - - - -
+
@@ -245,11 +190,8 @@ - - - -
+
@@ -258,11 +200,8 @@ - - - -
+
@@ -271,11 +210,8 @@ - - - -
+
@@ -284,11 +220,8 @@ - - - -
+
@@ -297,11 +230,8 @@ - - - -
+
@@ -310,11 +240,8 @@ - - - -
+
@@ -323,11 +250,8 @@ - - - -
+
@@ -336,11 +260,8 @@ - - - -
+
@@ -349,11 +270,8 @@ - - - -
+
@@ -362,11 +280,8 @@ - - - -
+
@@ -375,11 +290,8 @@ - - - -
+
@@ -388,11 +300,8 @@ - - - -
+
@@ -401,11 +310,8 @@ - - - -
+
@@ -414,11 +320,8 @@ - - - -
+
@@ -427,11 +330,8 @@ - - - -
+
@@ -440,11 +340,8 @@ - - - -
+
@@ -453,11 +350,8 @@ - - - -
+
@@ -466,11 +360,8 @@ - - - -
+
@@ -479,11 +370,8 @@ - - - -
+
@@ -492,11 +380,8 @@ - - - -
+
@@ -505,11 +390,8 @@ - - - -
+
@@ -518,11 +400,8 @@ - - - -
+
@@ -531,11 +410,8 @@ - - - -
+
@@ -544,11 +420,8 @@ - - - -
+
@@ -557,11 +430,8 @@ - - - -
+
@@ -570,11 +440,8 @@ - - - -
+
@@ -583,11 +450,8 @@ - - - -
+
@@ -596,11 +460,8 @@ - - - -
+
@@ -609,11 +470,8 @@ - - - -
+
@@ -622,11 +480,8 @@ - - - -
+
@@ -635,10 +490,6 @@ - - - -
@@ -649,11 +500,8 @@ - - - -
+
@@ -662,11 +510,8 @@ - - - -
+
@@ -675,11 +520,8 @@ - - - -
+
@@ -688,10 +530,6 @@ - - - -
@@ -702,10 +540,6 @@ - - - -
@@ -716,10 +550,6 @@ - - - -
@@ -730,9 +560,5 @@ - - - -
-- cgit v1.1 From fcaa4f601231a6feb7fd5ea40e35fba6220c6235 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 23 Jul 2011 02:05:51 +0100 Subject: Revert "Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default)." There actually are uses for this. I will correct the perms instead since some entries appear to be wrong. This reverts commit 667b54f5a2a04fa5a2859397868d270eab3913f1. --- .../AnimationsLibrary/AnimationsLibraryItems.xml | 6 + .../BodyPartsLibrary/BodyPartsLibraryItems.xml | 33 ++- .../ClothingLibrary/ClothingLibraryItems.xml | 14 +- .../GesturesLibrary/GesturesLibraryItems.xml | 80 ++++-- .../LandmarksLibrary/LandmarksLibraryItems.xml | 4 + .../NotecardsLibrary/NotecardsLibraryItems.xml | 14 +- .../ObjectsLibrary/ObjectsLibraryItems.xml | 4 + bin/inventory/OpenSimLibrary/OpenSimLibrary.xml | 4 + bin/inventory/PhotosLibrary/PhotosLibraryItems.xml | 4 + .../ScriptsLibrary/ScriptsLibraryItems.xml | 223 ++++++++++++----- bin/inventory/SoundsLibrary/SoundsLibraryItems.xml | 4 + .../TexturesLibrary/TexturesLibraryItems.xml | 274 +++++++++++++++++---- 12 files changed, 538 insertions(+), 126 deletions(-) (limited to 'bin') diff --git a/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml b/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml index 9cfadf0..2a6ceb4 100644 --- a/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml +++ b/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml @@ -108,6 +108,8 @@ + + diff --git a/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml b/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml index d9adf1c..aa8d9d9 100644 --- a/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml +++ b/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml @@ -9,6 +9,10 @@ + + + + --> - diff --git a/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml b/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml index a12bb8a..9e297f0 100644 --- a/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml +++ b/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml @@ -9,6 +9,10 @@ + + + + --> - diff --git a/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml b/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml index ca3ce2d..1312129 100644 --- a/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml +++ b/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml @@ -7,8 +7,11 @@ + + + + -
@@ -17,8 +20,11 @@ + + + +
-
@@ -27,8 +33,11 @@ + + + +
-
@@ -37,8 +46,11 @@ + + + +
-
@@ -47,8 +59,11 @@ + + + +
-
@@ -57,8 +72,11 @@ + + + +
-
@@ -67,8 +85,11 @@ + + + +
-
@@ -77,8 +98,11 @@ + + + +
-
@@ -87,8 +111,11 @@ + + + +
-
@@ -97,8 +124,11 @@ + + + +
-
@@ -107,8 +137,11 @@ + + + +
-
@@ -117,8 +150,11 @@ + + + +
-
@@ -127,8 +163,11 @@ + + + +
-
@@ -137,8 +176,11 @@ + + + +
-
@@ -147,8 +189,11 @@ + + + +
-
@@ -157,6 +202,9 @@ + + + +
- diff --git a/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml b/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml index 44194cd..4047a58 100644 --- a/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml +++ b/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml @@ -9,6 +9,10 @@ + + + + --> diff --git a/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml b/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml index e232bcc..713c365 100644 --- a/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml +++ b/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml @@ -9,6 +9,10 @@ + + + + --> @@ -20,8 +24,11 @@ + + + + -
@@ -30,6 +37,9 @@ + + + +
- diff --git a/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml b/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml index 44194cd..4047a58 100644 --- a/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml +++ b/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml @@ -9,6 +9,10 @@ + + + + --> diff --git a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml index bef59d8..7eb8de3 100644 --- a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml +++ b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml @@ -10,6 +10,10 @@ + + + + --> diff --git a/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml b/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml index 44194cd..4047a58 100644 --- a/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml +++ b/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml @@ -9,6 +9,10 @@ + + + + --> diff --git a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml index df9d867..9641f7d 100644 --- a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml +++ b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml @@ -25,8 +25,11 @@ + + + + -
@@ -35,8 +38,11 @@ + + + +
-
@@ -45,8 +51,11 @@ + + + +
-
@@ -55,8 +64,11 @@ + + + +
-
@@ -65,8 +77,11 @@ + + + +
-
@@ -75,8 +90,11 @@ + + + +
-
@@ -85,8 +103,11 @@ + + + +
-
@@ -95,8 +116,11 @@ + + + +
-
@@ -105,8 +129,11 @@ + + + +
-
@@ -115,8 +142,11 @@ + + + +
-
@@ -125,8 +155,11 @@ + + + +
-
@@ -136,8 +169,11 @@ + + + +
- @@ -151,7 +187,6 @@ -
@@ -160,8 +195,11 @@ + + + +
-
@@ -170,8 +208,11 @@ + + + +
-
@@ -180,8 +221,11 @@ + + + +
-
@@ -190,8 +234,11 @@ + + + +
-
@@ -201,8 +248,11 @@ + + + +
-
@@ -211,8 +261,11 @@ + + + +
-
@@ -221,8 +274,11 @@ + + + +
- @@ -232,166 +288,213 @@
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
-
- + + + + +
- -
@@ -400,8 +503,11 @@ + + + +
-
@@ -410,8 +516,11 @@ + + + +
-
@@ -420,5 +529,9 @@ + + + +
diff --git a/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml b/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml index 44194cd..4047a58 100644 --- a/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml +++ b/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml @@ -9,6 +9,10 @@ + + + + --> diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml index a018a0d..adba99a 100644 --- a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml +++ b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml @@ -9,6 +9,10 @@ + + + + --> @@ -20,8 +24,11 @@ + + + + -
@@ -30,8 +37,11 @@ + + + +
-
@@ -40,8 +50,11 @@ + + + +
-
@@ -50,8 +63,11 @@ + + + +
-
@@ -60,8 +76,11 @@ + + + +
-
@@ -70,8 +89,11 @@ + + + +
-
@@ -80,8 +102,11 @@ + + + +
-
@@ -90,8 +115,11 @@ + + + +
-
@@ -100,8 +128,11 @@ + + + +
-
@@ -110,8 +141,11 @@ + + + +
-
@@ -120,8 +154,11 @@ + + + +
-
@@ -130,8 +167,11 @@ + + + +
-
@@ -140,8 +180,11 @@ + + + +
-
@@ -150,8 +193,11 @@ + + + +
-
@@ -160,8 +206,11 @@ + + + +
-
@@ -170,8 +219,11 @@ + + + +
-
@@ -180,8 +232,11 @@ + + + +
-
@@ -190,8 +245,11 @@ + + + +
-
@@ -200,8 +258,11 @@ + + + +
-
@@ -210,8 +271,11 @@ + + + +
-
@@ -220,8 +284,11 @@ + + + +
-
@@ -230,8 +297,11 @@ + + + +
-
@@ -240,8 +310,11 @@ + + + +
-
@@ -250,8 +323,11 @@ + + + +
-
@@ -260,8 +336,11 @@ + + + +
-
@@ -270,8 +349,11 @@ + + + +
-
@@ -280,8 +362,11 @@ + + + +
-
@@ -290,8 +375,11 @@ + + + +
-
@@ -300,8 +388,11 @@ + + + +
-
@@ -310,8 +401,11 @@ + + + +
-
@@ -320,8 +414,11 @@ + + + +
-
@@ -330,8 +427,11 @@ + + + +
-
@@ -340,8 +440,11 @@ + + + +
-
@@ -350,8 +453,11 @@ + + + +
-
@@ -360,8 +466,11 @@ + + + +
-
@@ -370,8 +479,11 @@ + + + +
-
@@ -380,8 +492,11 @@ + + + +
-
@@ -390,8 +505,11 @@ + + + +
-
@@ -400,8 +518,11 @@ + + + +
-
@@ -410,8 +531,11 @@ + + + +
-
@@ -420,8 +544,11 @@ + + + +
-
@@ -430,8 +557,11 @@ + + + +
-
@@ -440,8 +570,11 @@ + + + +
-
@@ -450,8 +583,11 @@ + + + +
-
@@ -460,8 +596,11 @@ + + + +
-
@@ -470,8 +609,11 @@ + + + +
-
@@ -480,8 +622,11 @@ + + + +
-
@@ -490,6 +635,10 @@ + + + +
@@ -500,8 +649,11 @@ + + + +
-
@@ -510,8 +662,11 @@ + + + +
-
@@ -520,8 +675,11 @@ + + + +
-
@@ -530,6 +688,10 @@ + + + +
@@ -540,6 +702,10 @@ + + + +
@@ -550,6 +716,10 @@ + + + +
@@ -560,5 +730,9 @@ + + + +
-- cgit v1.1 From f0895028e96e39ca179cad8c103042397ad870e5 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 23 Jul 2011 02:13:11 +0100 Subject: Remove manually permissions settings on all current library items so that they use the defaults instead. Some items had completely wrong permissions - this is easier than correcting them all. The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts) --- .../AnimationsLibrary/AnimationsLibraryItems.xml | 6 - .../BodyPartsLibrary/BodyPartsLibraryItems.xml | 33 +-- .../ClothingLibrary/ClothingLibraryItems.xml | 14 +- .../GesturesLibrary/GesturesLibraryItems.xml | 80 ++---- .../LandmarksLibrary/LandmarksLibraryItems.xml | 4 - .../NotecardsLibrary/NotecardsLibraryItems.xml | 14 +- .../ObjectsLibrary/ObjectsLibraryItems.xml | 4 - bin/inventory/OpenSimLibrary/OpenSimLibrary.xml | 4 - bin/inventory/PhotosLibrary/PhotosLibraryItems.xml | 4 - .../ScriptsLibrary/ScriptsLibraryItems.xml | 223 +++++------------ bin/inventory/SoundsLibrary/SoundsLibraryItems.xml | 4 - .../TexturesLibrary/TexturesLibraryItems.xml | 274 ++++----------------- 12 files changed, 126 insertions(+), 538 deletions(-) (limited to 'bin') diff --git a/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml b/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml index 2a6ceb4..9cfadf0 100644 --- a/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml +++ b/bin/inventory/AnimationsLibrary/AnimationsLibraryItems.xml @@ -108,8 +108,6 @@ - - diff --git a/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml b/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml index aa8d9d9..d9adf1c 100644 --- a/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml +++ b/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> + diff --git a/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml b/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml index 9e297f0..a12bb8a 100644 --- a/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml +++ b/bin/inventory/ClothingLibrary/ClothingLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> + diff --git a/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml b/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml index 1312129..ca3ce2d 100644 --- a/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml +++ b/bin/inventory/GesturesLibrary/GesturesLibraryItems.xml @@ -7,11 +7,8 @@ - - - - +
@@ -20,11 +17,8 @@ - - - -
+
@@ -33,11 +27,8 @@ - - - -
+
@@ -46,11 +37,8 @@ - - - -
+
@@ -59,11 +47,8 @@ - - - -
+
@@ -72,11 +57,8 @@ - - - -
+
@@ -85,11 +67,8 @@ - - - -
+
@@ -98,11 +77,8 @@ - - - -
+
@@ -111,11 +87,8 @@ - - - -
+
@@ -124,11 +97,8 @@ - - - -
+
@@ -137,11 +107,8 @@ - - - -
+
@@ -150,11 +117,8 @@ - - - -
+
@@ -163,11 +127,8 @@ - - - -
+
@@ -176,11 +137,8 @@ - - - -
+
@@ -189,11 +147,8 @@ - - - -
+
@@ -202,9 +157,6 @@ - - - -
+ diff --git a/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml b/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml index 4047a58..44194cd 100644 --- a/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml +++ b/bin/inventory/LandmarksLibrary/LandmarksLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> diff --git a/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml b/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml index 713c365..e232bcc 100644 --- a/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml +++ b/bin/inventory/NotecardsLibrary/NotecardsLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> @@ -24,11 +20,8 @@ - - - - +
@@ -37,9 +30,6 @@ - - - -
+ diff --git a/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml b/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml index 4047a58..44194cd 100644 --- a/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml +++ b/bin/inventory/ObjectsLibrary/ObjectsLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> diff --git a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml index 7eb8de3..bef59d8 100644 --- a/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml +++ b/bin/inventory/OpenSimLibrary/OpenSimLibrary.xml @@ -10,10 +10,6 @@ - - - - --> diff --git a/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml b/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml index 4047a58..44194cd 100644 --- a/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml +++ b/bin/inventory/PhotosLibrary/PhotosLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> diff --git a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml index 9641f7d..df9d867 100644 --- a/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml +++ b/bin/inventory/ScriptsLibrary/ScriptsLibraryItems.xml @@ -25,11 +25,8 @@ - - - - +
@@ -38,11 +35,8 @@ - - - -
+
@@ -51,11 +45,8 @@ - - - -
+
@@ -64,11 +55,8 @@ - - - -
+
@@ -77,11 +65,8 @@ - - - -
+
@@ -90,11 +75,8 @@ - - - -
+
@@ -103,11 +85,8 @@ - - - -
+
@@ -116,11 +95,8 @@ - - - -
+
@@ -129,11 +105,8 @@ - - - -
+
@@ -142,11 +115,8 @@ - - - -
+
@@ -155,11 +125,8 @@ - - - -
+
@@ -169,11 +136,8 @@ - - - -
+ @@ -187,6 +151,7 @@ +
@@ -195,11 +160,8 @@ - - - -
+
@@ -208,11 +170,8 @@ - - - -
+
@@ -221,11 +180,8 @@ - - - -
+
@@ -234,11 +190,8 @@ - - - -
+
@@ -248,11 +201,8 @@ - - - -
+
@@ -261,11 +211,8 @@ - - - -
+
@@ -274,11 +221,8 @@ - - - -
+ @@ -288,213 +232,166 @@
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+
- + - - - -
+ +
@@ -503,11 +400,8 @@ - - - -
+
@@ -516,11 +410,8 @@ - - - -
+
@@ -529,9 +420,5 @@ - - - -
diff --git a/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml b/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml index 4047a58..44194cd 100644 --- a/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml +++ b/bin/inventory/SoundsLibrary/SoundsLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml index adba99a..a018a0d 100644 --- a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml +++ b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml @@ -9,10 +9,6 @@ - - - - --> @@ -24,11 +20,8 @@ - - - - +
@@ -37,11 +30,8 @@ - - - -
+
@@ -50,11 +40,8 @@ - - - -
+
@@ -63,11 +50,8 @@ - - - -
+
@@ -76,11 +60,8 @@ - - - -
+
@@ -89,11 +70,8 @@ - - - -
+
@@ -102,11 +80,8 @@ - - - -
+
@@ -115,11 +90,8 @@ - - - -
+
@@ -128,11 +100,8 @@ - - - -
+
@@ -141,11 +110,8 @@ - - - -
+
@@ -154,11 +120,8 @@ - - - -
+
@@ -167,11 +130,8 @@ - - - -
+
@@ -180,11 +140,8 @@ - - - -
+
@@ -193,11 +150,8 @@ - - - -
+
@@ -206,11 +160,8 @@ - - - -
+
@@ -219,11 +170,8 @@ - - - -
+
@@ -232,11 +180,8 @@ - - - -
+
@@ -245,11 +190,8 @@ - - - -
+
@@ -258,11 +200,8 @@ - - - -
+
@@ -271,11 +210,8 @@ - - - -
+
@@ -284,11 +220,8 @@ - - - -
+
@@ -297,11 +230,8 @@ - - - -
+
@@ -310,11 +240,8 @@ - - - -
+
@@ -323,11 +250,8 @@ - - - -
+
@@ -336,11 +260,8 @@ - - - -
+
@@ -349,11 +270,8 @@ - - - -
+
@@ -362,11 +280,8 @@ - - - -
+
@@ -375,11 +290,8 @@ - - - -
+
@@ -388,11 +300,8 @@ - - - -
+
@@ -401,11 +310,8 @@ - - - -
+
@@ -414,11 +320,8 @@ - - - -
+
@@ -427,11 +330,8 @@ - - - -
+
@@ -440,11 +340,8 @@ - - - -
+
@@ -453,11 +350,8 @@ - - - -
+
@@ -466,11 +360,8 @@ - - - -
+
@@ -479,11 +370,8 @@ - - - -
+
@@ -492,11 +380,8 @@ - - - -
+
@@ -505,11 +390,8 @@ - - - -
+
@@ -518,11 +400,8 @@ - - - -
+
@@ -531,11 +410,8 @@ - - - -
+
@@ -544,11 +420,8 @@ - - - -
+
@@ -557,11 +430,8 @@ - - - -
+
@@ -570,11 +440,8 @@ - - - -
+
@@ -583,11 +450,8 @@ - - - -
+
@@ -596,11 +460,8 @@ - - - -
+
@@ -609,11 +470,8 @@ - - - -
+
@@ -622,11 +480,8 @@ - - - -
+
@@ -635,10 +490,6 @@ - - - -
@@ -649,11 +500,8 @@ - - - -
+
@@ -662,11 +510,8 @@ - - - -
+
@@ -675,11 +520,8 @@ - - - -
+
@@ -688,10 +530,6 @@ - - - -
@@ -702,10 +540,6 @@ - - - -
@@ -716,10 +550,6 @@ - - - -
@@ -730,9 +560,5 @@ - - - -
-- cgit v1.1 From 4eaca4884eca26ca4cb73a6ce4c7edee38b789ac Mon Sep 17 00:00:00 2001 From: Makopoppo Date: Sun, 17 Jul 2011 11:22:29 +0900 Subject: Fixed serverside_object_permission default value confliction --- bin/OpenSimDefaults.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index bf36228..a7e40db 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -169,8 +169,8 @@ ; If set to false, then, in theory, the server never carries out permission checks (allowing anybody to copy ; any item, etc. This may not yet be implemented uniformally. ; If set to true, then all permissions checks are carried out - ; Default is false - serverside_object_permissions = false + ; Default is true + serverside_object_permissions = true allow_grid_gods = false -- cgit v1.1 From ea58aee338a1e1fa0b1ecc8898c38686c12be44c Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 23 Jul 2011 02:31:00 +0100 Subject: Change default AllowScriptCrossings config setting to true. When this setting is false and other defaults haven't been changed, scripts entering the simulator from another sim are automatically restarted but their state is not preserved. When this setting is true, state that accompanies the script is reloaded (e.g. if a script had a variable i = 1 when leaving the source region, it will still have i = 1 on the destination region). This setting does not affect crossings when regions are run in the same simulator. In this case, state is already preserved. --- bin/OpenSim.ini.example | 8 +++++--- bin/OpenSimDefaults.ini | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 2fe4db7..e3b127f 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -80,9 +80,11 @@ ;; This can be overriden in the region config file. ; ClampPrimSize = false - ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} false - ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. Script code is recompiled on the destination region and the state reloaded. - ; AllowScriptCrossing = false + ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true + ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. + ;; This only applies when crossing to a region running in a different simulator. + ;; For crossings where the regions are on the same simulator the script is always kept running. + ; AllowScriptCrossing = true ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false ;; Allow compiled script binary code to cross region boundaries. diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index a7e40db..b689f88 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -77,8 +77,10 @@ ; This can be overriden in the region config file. ClampPrimSize = false - ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. Script code is recompiled on the destination region and the state reloaded. - AllowScriptCrossing = false + ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. + ; This only applies when crossing to a region running in a different simulator. + ; For crossings where the regions are on the same simulator the script is always kept running. + AllowScriptCrossing = true ; Allow compiled script binary code to cross region boundaries. ; If you set this to "true", any region that can teleport to you can -- cgit v1.1 From a95f2fe4b304e01767c04803a965665398341d05 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Mon, 25 Jul 2011 10:11:55 -0700 Subject: BulletSim: Update dlls --- bin/BulletSim-x86_64.dll | Bin 754688 -> 754688 bytes bin/BulletSim.dll | Bin 654336 -> 654336 bytes bin/libBulletSim.so | Bin 1734638 -> 1734658 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll index 6e1b9f0..bcdea44 100755 Binary files a/bin/BulletSim-x86_64.dll and b/bin/BulletSim-x86_64.dll differ diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll index c9f9637..5dc51db 100755 Binary files a/bin/BulletSim.dll and b/bin/BulletSim.dll differ diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so index 8da2c9f..82d3b34 100755 Binary files a/bin/libBulletSim.so and b/bin/libBulletSim.so differ -- cgit v1.1 From 835352aee99ac8c8f940ea0343069ce74c0963ec Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 30 Jul 2011 01:05:30 +0100 Subject: Make it clearer what the save_crashes setting in [Startup] actually does. --- bin/OpenSim.ini.example | 3 +++ bin/OpenSimDefaults.ini | 3 +++ 2 files changed, 6 insertions(+) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index e3b127f..5da80c0 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -39,6 +39,9 @@ ;# {save_crashes} {} {Save crashes to disk?} {true false} false ;; Set this to true if you want to log crashes to disk ;; this can be useful when submitting bug reports. + ;; However, this will only log crashes within OpenSimulator that cause the entire program to exit + ;; It will not log crashes caused by virtual machine failures, which includes mono and ODE failures. + ;; You will need to capture these native stack traces by recording the session log itself. ; save_crashes = false ;# {crash_dir} {save_crashes:true} {Directory to save crashes to?} {} crashes diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index b689f88..59088c4 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -5,6 +5,9 @@ [Startup] ; Set this to true if you want to log crashes to disk ; this can be useful when submitting bug reports. + ; However, this will only log crashes within OpenSimulator that cause the entire program to exit + ; It will not log crashes caused by virtual machine failures, which includes mono and ODE failures. + ; You will need to capture these native stack traces by recording the session log itself. save_crashes = false ; Directory to save crashes to if above is enabled -- cgit v1.1 From 59f548cda82facef003fb7309180412254a234a1 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Mon, 1 Aug 2011 23:41:29 +0100 Subject: Get osNpcCreate appearance working with avatars that are currently in the scene. Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing). Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing. Extended TestCreate() to check this. --- ...OpenSim.Region.OptionalModules.Tests.dll.config | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 bin/OpenSim.Region.OptionalModules.Tests.dll.config (limited to 'bin') diff --git a/bin/OpenSim.Region.OptionalModules.Tests.dll.config b/bin/OpenSim.Region.OptionalModules.Tests.dll.config new file mode 100644 index 0000000..a3f681d --- /dev/null +++ b/bin/OpenSim.Region.OptionalModules.Tests.dll.config @@ -0,0 +1,33 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1 From 797def8aa4a009ba3bc44d6b73e063e4bb61ba97 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 3 Aug 2011 04:33:45 +0100 Subject: Put config to enable disable [NPC] module. Default is disabled. You will need to explicitly enable to toy with this. --- bin/OpenSim.ini.example | 6 ++++++ bin/OpenSimDefaults.ini | 4 ++++ 2 files changed, 10 insertions(+) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 5da80c0..1a87b79 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -716,6 +716,12 @@ ; Enabled = true; +[NPC] + ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false + ;; Enable media on a prim facilities + ; Enabled = false + + [PrimLimitsModule] ;# {EnforcePrimLimits} {} {Enforce parcel prim limits} {true false} false ;; Enable parcel prim limits. Off by default to emulate pre-existing behavior. diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 59088c4..d74f373 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1366,6 +1366,10 @@ ; Enable media on a prim facilities Enabled = true; +[NPC] + ;; Enable media on a prim facilities + Enabled = false + ;; ;; If you are using a simian grid frontend you can enable ;; this module to upload tile images for the mapping fn -- cgit v1.1 From c1c0d780ee26edfe4d3fe28a8168a57a46533d52 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 3 Aug 2011 04:36:25 +0100 Subject: correct config comments mistakes --- bin/OpenSim.ini.example | 1 - bin/OpenSimDefaults.ini | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 1a87b79..bcfaf76 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -718,7 +718,6 @@ [NPC] ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false - ;; Enable media on a prim facilities ; Enabled = false diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index d74f373..23218f1 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1367,7 +1367,7 @@ Enabled = true; [NPC] - ;; Enable media on a prim facilities + ;; Enable Non Player Character (NPC) facilities Enabled = false ;; -- cgit v1.1 From 7640b5abf651e51ae2efd5f79f440768a595dbc9 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Fri, 5 Aug 2011 11:01:27 -0700 Subject: BulletSim: Parameters settable from ini file. Linksets. Physical property value tuning --- bin/BulletSim-x86_64.dll | Bin 754688 -> 755200 bytes bin/BulletSim.dll | Bin 654336 -> 653824 bytes bin/OpenSimDefaults.ini | 42 ++++++++++++++++++++++++++++++++++++++++++ bin/libBulletSim.so | Bin 1734658 -> 1734700 bytes 4 files changed, 42 insertions(+) (limited to 'bin') diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll index bcdea44..750b2f5 100755 Binary files a/bin/BulletSim-x86_64.dll and b/bin/BulletSim-x86_64.dll differ diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll index 5dc51db..d5c76da 100755 Binary files a/bin/BulletSim.dll and b/bin/BulletSim.dll differ diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index bf36228..d487ce6 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -159,6 +159,7 @@ ;physics = basicphysics ;physics = POS ;physics = modified_BulletX + ;physics = BulletSim ; ## ; ## PERMISSIONS @@ -725,6 +726,47 @@ ; true. Note that this will increase memory usage and region startup time. Default is false. ;force_simple_prim_meshing = true +[BulletSim] + ; World parameters + DefaultFriction = 0.70 + DefaultDensity = 10.000006836 + DefaultRestitution = 0.0 + Gravity = -9.80665 + + TerrainFriction = 0.85 + TerrainHitFriction = 0.8 + TerrainRestitution = 0.2 + AvatarFriction = 0.85 + AvatarDensity = 60.0 + AvatarCapsuleRadius = 0.37 + AvatarCapsuleHeight = 1.5 + + MaxObjectMass = 10000.01 + + ; Dynamic parameters + LinearDamping = 0.0 + AngularDamping = 0.0 + DeactivationTime = 0.2 + LinearSleepingThreshold = 0.8 + AngularSleepingThreshold = 1.0 + CcdMotionThreshold = 0.5 + CcdSweptSphereRadius = 0.2 + + ; Whether to mesh sculpties + MeshSculptedPrim = true + + ; If 'true', force simple prims (box and sphere) to be meshed + ForceSimplePrimMeshing = false + + ; number^2 non-physical level of detail of the sculpt texture. 32x32 - 1024 verticies + MeshLevelOfDetail = 32 + + ; Bullet step parameters + MaxSubSteps = 10; + FixedTimeStep = .01667 + + MaxCollisionsPerFrame = 2048 + MaxUpdatesPerFrame = 2048 [RemoteAdmin] enabled = false diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so index 82d3b34..275355d 100755 Binary files a/bin/libBulletSim.so and b/bin/libBulletSim.so differ -- cgit v1.1 From e19843a0ee6deb1f9f96a954c97c011b3110aac0 Mon Sep 17 00:00:00 2001 From: Snoopy Pfeffer Date: Sun, 14 Aug 2011 17:45:23 +0200 Subject: WorldMap: Added map item for Land-for-Sale. Implemented backlist item timeouts (default 10 minutes; see also new config file setting BlacklistTimeout) and removing backlisted neigboring regions that have been restarted from the blacklist. --- bin/OpenSimDefaults.ini | 3 +++ 1 file changed, 3 insertions(+) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 23218f1..31e86a5 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -216,6 +216,9 @@ ;WorldMapModule = "WorldMap" ;MapImageModule = "MapImageModule" + ; World map blacklist timeout in seconds + ;BlacklistTimeout = 600 + ; Set to false to not generate any maptiles ;GenerateMaptiles = true -- cgit v1.1 From 70ea62544716134447884e999898267497b85a12 Mon Sep 17 00:00:00 2001 From: Snoopy Pfeffer Date: Sun, 14 Aug 2011 18:20:20 +0200 Subject: Added optional Login Service parameter "Currency" to be able to change the currency name shown in the viewer. --- bin/Robust.HG.ini.example | 2 ++ bin/Robust.ini.example | 2 ++ bin/config-include/StandaloneCommon.ini.example | 2 ++ 3 files changed, 6 insertions(+) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index ea271b8..b760abd 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -203,6 +203,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" + ;Currency = "" + WelcomeMessage = "Welcome, Avatar!" AllowRemoteSetLoginLevel = "false" diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index 14f79aa..a36d255 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -188,6 +188,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" + ;Currency = "" + WelcomeMessage = "Welcome, Avatar!" AllowRemoteSetLoginLevel = "false" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index ee0523f..babd116 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -99,6 +99,8 @@ ;; For Viewer 2 MapTileURL = "http://127.0.0.1:9000/" + ;Currency = "" + ;; Regular expressions for controlling which client versions are accepted/denied. ;; An empty string means nothing is checked. ;; -- cgit v1.1 From e29e50798a248bbcae3b541397a6087a511d5133 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 16 Aug 2011 21:31:48 +0100 Subject: minor: Add warning to OpenSim.ini.example about bullet plugins not working right now, pending the new plugin --- bin/OpenSim.ini.example | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index bcfaf76..45fe399 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -151,6 +151,7 @@ ;; 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. ;; Default is OpenDynamicsEngine ; physics = OpenDynamicsEngine ; physics = basicphysics -- cgit v1.1 From 96ee87e39bf0310aa5648b04e1a5d47d5795daab Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 16 Aug 2011 21:38:51 +0100 Subject: Change the default standalone asset cache to be the Flotsam asset cache (with memory caching not enabled). This matches the GridCommon setting and is the best tested setting. It appears to work fine on standalone. Also, add information that the flotsam asset cache is the recommended cache, since it is most used and actively maintained. --- bin/config-include/GridCommon.ini.example | 1 + bin/config-include/StandaloneCommon.ini.example | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 4e34059..c5598c0 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -122,6 +122,7 @@ [Modules] ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. ;; Copy the config .example file into your own .ini file and change configs there + ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained. AssetCaching = "FlotsamAssetCache" Include-FlotsamCache = "config-include/FlotsamCache.ini" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index babd116..431dce1 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -45,14 +45,15 @@ [Modules] ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. ;; Copy the config .example file into your own .ini file and change configs there + ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained. - ;AssetCaching = "GlynnTuckerAssetCache" + AssetCaching = "FlotsamAssetCache" + Include-FlotsamCache = "config-include/FlotsamCache.ini" - ;AssetCaching = "FlotsamAssetCache" - ;Include-FlotsamCache = "config-include/FlotsamCache.ini" + ;AssetCaching = "GlynnTuckerAssetCache" - AssetCaching = "CenomeMemoryAssetCache" - Include-CenomeCache = "config-include/CenomeCache.ini" + ; AssetCaching = "CenomeMemoryAssetCache" + ; Include-CenomeCache = "config-include/CenomeCache.ini" ;; Authorization is not on by default, as it depends on external php ;AuthorizationServices = "LocalAuthorizationServicesConnector" -- cgit v1.1 From eb431f91c092eda1e06bb5f47d604eedcf892ec7 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 16 Aug 2011 21:50:15 +0100 Subject: Add terminating quotes to http addresses in [SimulatorFeatures] section of OpenSim.ini.example. As per http://opensimulator.org/mantis/view.php?id=5638. Thanks DutchGlory. --- bin/OpenSim.ini.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 45fe399..c36d2a4 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -319,8 +319,8 @@ ; meant to override the MapImage and search server url given at login, and varying ; on a sim-basis. ; Viewers that don't understand it, will ignore it - ;MapImageServerURI = "http://127.0.0.1:9000/ - ;SearchServerURI = "http://127.0.0.1:9000/ + ;MapImageServerURI = "http://127.0.0.1:9000/" + ;SearchServerURI = "http://127.0.0.1:9000/" [Chat] -- cgit v1.1 From fef73a1a1011126d4df2da2279caae9cef7984d1 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Thu, 18 Aug 2011 14:32:09 -0700 Subject: BulletSim: add runtime setting of physics parameters. Update default values. --- bin/BulletSim-x86_64.dll | Bin 755200 -> 756736 bytes bin/BulletSim.dll | Bin 653824 -> 656384 bytes bin/libBulletSim.so | Bin 1734700 -> 1741561 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll index 750b2f5..ab4c19b 100755 Binary files a/bin/BulletSim-x86_64.dll and b/bin/BulletSim-x86_64.dll differ diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll index d5c76da..8a90623 100755 Binary files a/bin/BulletSim.dll and b/bin/BulletSim.dll differ diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so index 275355d..497ced7 100755 Binary files a/bin/libBulletSim.so and b/bin/libBulletSim.so differ -- cgit v1.1 From a0a0c64cb181b56d9e87bbcf9eaa731171af2e41 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 19 Aug 2011 03:02:17 +0100 Subject: Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.dll (patched version) instead --- bin/HttpServer.dll | Bin 102400 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100755 bin/HttpServer.dll (limited to 'bin') diff --git a/bin/HttpServer.dll b/bin/HttpServer.dll deleted file mode 100755 index 717ceed..0000000 Binary files a/bin/HttpServer.dll and /dev/null differ -- cgit v1.1 From 2307d9a2f9e733fd2c18928a6aebdffb5e22c9a9 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Mon, 22 Aug 2011 00:58:11 +0100 Subject: minor: Add explanative text for the new currency parameter. Convert some tabs to spaces --- bin/Robust.HG.ini.example | 1 + bin/Robust.ini.example | 1 + bin/config-include/StandaloneCommon.ini.example | 33 +++++++++++++------------ 3 files changed, 19 insertions(+), 16 deletions(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index b760abd..910ba02 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -203,6 +203,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" + ;; Ask co-operative viewers to use a different currency name ;Currency = "" WelcomeMessage = "Welcome, Avatar!" diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example index a36d255..f7781ab 100644 --- a/bin/Robust.ini.example +++ b/bin/Robust.ini.example @@ -188,6 +188,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService" FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService" + ;; Ask co-operative viewers to use a different currency name ;Currency = "" WelcomeMessage = "Welcome, Avatar!" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 431dce1..c057887 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -97,25 +97,26 @@ SRV_FriendsServerURI = "http://127.0.0.1:9000" SRV_IMServerURI = "http://127.0.0.1:9000" - ;; For Viewer 2 - MapTileURL = "http://127.0.0.1:9000/" + ;; For Viewer 2 + MapTileURL = "http://127.0.0.1:9000/" + ;; Ask co-operative viewers to use a different currency name ;Currency = "" - ;; Regular expressions for controlling which client versions are accepted/denied. - ;; An empty string means nothing is checked. - ;; - ;; Example 1: allow only these 3 types of clients (any version of them) - ;; AllowedClients = "Imprudence|Hippo|Second Life" - ;; - ;; Example 2: allow all clients except these - ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald" - ;; - ;; Note that these are regular expressions, so every character counts. - ;; Also note that this is very weak security and should not be trusted as a reliable means - ;; for keeping bad clients out; modified clients can fake their identifiers. - ;; - ;; + ;; Regular expressions for controlling which client versions are accepted/denied. + ;; An empty string means nothing is checked. + ;; + ;; Example 1: allow only these 3 types of clients (any version of them) + ;; AllowedClients = "Imprudence|Hippo|Second Life" + ;; + ;; Example 2: allow all clients except these + ;; DeniedClients = "Twisted|Crawler|Cryolife|FuckLife|StreetLife|GreenLife|AntiLife|KORE-Phaze|Synlyfe|Purple Second Life|SecondLi |Emerald" + ;; + ;; Note that these are regular expressions, so every character counts. + ;; Also note that this is very weak security and should not be trusted as a reliable means + ;; for keeping bad clients out; modified clients can fake their identifiers. + ;; + ;; ;AllowedClients = "" ;DeniedClients = "" -- cgit v1.1 From 21708b832b1d6679d5f6de27eb3bd0b920ef0fa7 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Fri, 26 Aug 2011 15:51:21 -0700 Subject: BulletSim: add mesh representation. Use meshes for static objects and switch to hulls for physical objects. --- bin/BulletSim-x86_64.dll | Bin 756736 -> 784384 bytes bin/BulletSim.dll | Bin 656384 -> 676352 bytes bin/OpenSimDefaults.ini | 4 +++- bin/libBulletSim.so | Bin 1741561 -> 1857855 bytes 4 files changed, 3 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll index ab4c19b..a25b93b 100755 Binary files a/bin/BulletSim-x86_64.dll and b/bin/BulletSim-x86_64.dll differ diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll index 8a90623..efd420a 100755 Binary files a/bin/BulletSim.dll and b/bin/BulletSim.dll differ diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index e38c0ea..f1c0aab 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -766,8 +766,10 @@ ; If 'true', force simple prims (box and sphere) to be meshed ForceSimplePrimMeshing = false + ; level of detail for physical meshes. 32,16,8 or 4 with 32 being full detail + MeshLevelOfDetail = 8 ; number^2 non-physical level of detail of the sculpt texture. 32x32 - 1024 verticies - MeshLevelOfDetail = 32 + SculptLevelOfDetail = 32 ; Bullet step parameters MaxSubSteps = 10; diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so index 497ced7..44afb5e 100755 Binary files a/bin/libBulletSim.so and b/bin/libBulletSim.so differ -- cgit v1.1 From b281163457fe40f14b2a5434296cd87816307657 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Tue, 30 Aug 2011 13:19:53 -0700 Subject: BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read. --- bin/BulletSim-x86_64.dll | Bin 784384 -> 784384 bytes bin/BulletSim.dll | Bin 676352 -> 676352 bytes ...OpenSim.Region.Physics.BulletSPlugin.dll.config | 6 ------ ...OpenSim.Region.Physics.BulletSPlugin.dll.config | 6 ++++++ bin/libBulletSim-x86_64.so | Bin 0 -> 2005396 bytes 5 files changed, 6 insertions(+), 6 deletions(-) delete mode 100755 bin/OpenSim.Region.Physics.BulletSPlugin.dll.config create mode 100755 bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config create mode 100755 bin/libBulletSim-x86_64.so (limited to 'bin') diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll index a25b93b..6620759 100755 Binary files a/bin/BulletSim-x86_64.dll and b/bin/BulletSim-x86_64.dll differ diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll index efd420a..ffb5380 100755 Binary files a/bin/BulletSim.dll and b/bin/BulletSim.dll differ diff --git a/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config deleted file mode 100755 index e521493..0000000 --- a/bin/OpenSim.Region.Physics.BulletSPlugin.dll.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - 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..e521493 --- /dev/null +++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/bin/libBulletSim-x86_64.so b/bin/libBulletSim-x86_64.so new file mode 100755 index 0000000..cd2db40 Binary files /dev/null and b/bin/libBulletSim-x86_64.so differ -- cgit v1.1 From b705ad477e2d1baa683f24ba6ed6c0738cc7f39b Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Tue, 30 Aug 2011 13:49:50 -0700 Subject: BulletSim: update values in OpenSimDefaults.ini to the same as defaults in the source. --- bin/OpenSimDefaults.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index f1c0aab..ca4fbfb 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -736,15 +736,15 @@ [BulletSim] ; World parameters - DefaultFriction = 0.70 + DefaultFriction = 0.50 DefaultDensity = 10.000006836 DefaultRestitution = 0.0 Gravity = -9.80665 - TerrainFriction = 0.85 + TerrainFriction = 0.50 TerrainHitFriction = 0.8 - TerrainRestitution = 0.2 - AvatarFriction = 0.85 + TerrainRestitution = 0 + AvatarFriction = 0 AvatarDensity = 60.0 AvatarCapsuleRadius = 0.37 AvatarCapsuleHeight = 1.5 -- cgit v1.1 From 9e4153f16bcf8d559e87cf7986acc74faa421484 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 30 Aug 2011 23:17:02 +0100 Subject: Hack our copy of Prebuild to just delete the dlls and mdbs in Physics, so as to leave the new config file --- bin/Prebuild.exe | Bin 228352 -> 228352 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index d79227c..4c08aac 100755 Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ -- cgit v1.1 From 91f59f246f53095662e799ff2bb6aca30177a314 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 30 Aug 2011 23:20:54 +0100 Subject: also get "nant clean" to remove old .mdb from .exe and .dll --- bin/Prebuild.exe | Bin 228352 -> 228352 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index 4c08aac..ead3c6b 100755 Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ -- cgit v1.1 From 9f75eaf50e42ef6409fc272ba33a817241907ed8 Mon Sep 17 00:00:00 2001 From: Snoopy Pfeffer Date: Sun, 4 Sep 2011 21:42:33 +0200 Subject: Fixed BulletSim config files for Linux *.so libraries. --- bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config index e521493..026417a 100755 --- a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config +++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config @@ -1,6 +1,6 @@ - - + + -- cgit v1.1