From d29fc5305222abcc081daa7aa4b0b017d04bbae1 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Tue, 18 Sep 2012 09:47:15 -0400 Subject: Fix some inconsistencies in configurartion: NonPhys prims Fix inconsistencies between configuration parameter names and their description names. Changing the configuration parameters for non physical prim size min-max from Nonphys* to NonPhys*. Please update your OpenSim.ini and Regions.ini to reflect these changes. --- bin/OpenSim.ini.example | 8 ++++---- bin/OpenSimDefaults.ini | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 0de4002..cd90517 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -88,12 +88,12 @@ ; allow_regionless = false ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.01 - ;; Minimum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMin!). - ; NonphysicalPrimMin = 0.01 + ;; Minimum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonPhysicalPrimMin!). + ; NonPhysicalPrimMin = 0.01 ;# {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 + ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonPhysicalPrimMax!). + ; NonPhysicalPrimMax = 256 ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 10 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file. diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 0173f5b..ef4f578 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -85,8 +85,8 @@ ;; from the selected region_info_source. allow_regionless = false - ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). - NonphysicalPrimMax = 256 + ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonPhysicalPrimMax!). + NonPhysicalPrimMax = 256 ; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file. PhysicalPrimMax = 10 -- cgit v1.1 From 9d973ec3b377f51eab4cbd8ef7528d91477fc1d7 Mon Sep 17 00:00:00 2001 From: BlueWall Date: Tue, 18 Sep 2012 10:09:32 -0400 Subject: Cleanup from prev. commit Make correct defaults to Phys/nonPhys prims to fix errors in prev. commit --- 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 cd90517..3ec4bab 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -87,9 +87,9 @@ ;; from the selected region_info_source. ; allow_regionless = false - ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.01 + ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001 ;; Minimum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonPhysicalPrimMin!). - ; NonPhysicalPrimMin = 0.01 + ; NonPhysicalPrimMin = 0.001 ;# {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!). -- cgit v1.1 From 95809cabd947dcbbc69526fec2ad05a10458ddd3 Mon Sep 17 00:00:00 2001 From: justincc Date: Tue, 18 Sep 2012 23:45:06 +0100 Subject: Update libopenmetaverse components to commit f5cecaa Among other things this allows pCampbot to work under Windows since libopenmateverse now ships the same log4net.dll (publicly signed) as OpenSimulator This also updates the libopenmetaverse embedded libopenjpeg from 1.3 to 1.5. DLL naming and mapping for non-Windows libopenjpeg changes to remove version number to make future udpates easier and bring it into line with names of other shipped DLLs. libopenjpeg updates have been made for OSX, Windows (32 and 64 bit) and Linux (32 and 64 bit). Please report any issues. --- bin/OpenMetaverse.Rendering.Meshmerizer.dll | Bin 24576 -> 24576 bytes bin/OpenMetaverse.StructuredData.dll | Bin 114688 -> 102400 bytes bin/OpenMetaverse.dll | Bin 1904640 -> 1765376 bytes bin/OpenMetaverse.dll.config | 8 +++----- bin/OpenMetaverseTypes.dll | Bin 122880 -> 114688 bytes .../libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so | Bin 124540 -> 0 bytes bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so | Bin 128100 -> 0 bytes bin/lib32/libopenjpeg-dotnet.so | Bin 0 -> 139088 bytes .../libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so | Bin 142616 -> 0 bytes .../libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib | Bin 125136 -> 0 bytes bin/lib64/libopenjpeg-dotnet-x86_64.so | Bin 0 -> 149392 bytes bin/lib64/libopenjpeg-dotnet.dylib | Bin 0 -> 147288 bytes bin/openjpeg-dotnet-x86_64.dll | Bin 843776 -> 215040 bytes bin/openjpeg-dotnet.dll | Bin 187392 -> 201216 bytes bin/pCampBot.exe.config | 0 15 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so delete mode 100644 bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so create mode 100755 bin/lib32/libopenjpeg-dotnet.so delete mode 100644 bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so delete mode 100644 bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib create mode 100755 bin/lib64/libopenjpeg-dotnet-x86_64.so create mode 100755 bin/lib64/libopenjpeg-dotnet.dylib mode change 100644 => 100755 bin/pCampBot.exe.config (limited to 'bin') diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll index 1b4cab5..30b9c7b 100755 Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll index 7b5174d..5c0b3c6 100755 Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll index a08b406..511096e 100755 Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config index e8c90a4..b67da5f 100644 --- a/bin/OpenMetaverse.dll.config +++ b/bin/OpenMetaverse.dll.config @@ -1,7 +1,5 @@ - - - - - + + + diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll index fc4f8eb..8bc8885 100755 Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ diff --git a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so deleted file mode 100644 index 0106b56..0000000 Binary files a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686.so and /dev/null differ diff --git a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so b/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so deleted file mode 100644 index 53543e7..0000000 Binary files a/bin/lib32/libopenjpeg-dotnet-2.1.3.0-dotnet-1.so and /dev/null differ diff --git a/bin/lib32/libopenjpeg-dotnet.so b/bin/lib32/libopenjpeg-dotnet.so new file mode 100755 index 0000000..5914368 Binary files /dev/null and b/bin/lib32/libopenjpeg-dotnet.so differ diff --git a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so deleted file mode 100644 index be11bb4..0000000 Binary files a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64.so and /dev/null differ diff --git a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib b/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib deleted file mode 100644 index dc50775..0000000 Binary files a/bin/lib64/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib and /dev/null differ diff --git a/bin/lib64/libopenjpeg-dotnet-x86_64.so b/bin/lib64/libopenjpeg-dotnet-x86_64.so new file mode 100755 index 0000000..421dc56 Binary files /dev/null and b/bin/lib64/libopenjpeg-dotnet-x86_64.so differ diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib new file mode 100755 index 0000000..18ca868 Binary files /dev/null and b/bin/lib64/libopenjpeg-dotnet.dylib differ diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll index 97729ff..9e8cd21 100755 Binary files a/bin/openjpeg-dotnet-x86_64.dll and b/bin/openjpeg-dotnet-x86_64.dll differ diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll index 64b2557..6377b8d 100755 Binary files a/bin/openjpeg-dotnet.dll and b/bin/openjpeg-dotnet.dll differ diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config old mode 100644 new mode 100755 -- cgit v1.1 From f99278c95658f0e8ce7f1bba1ca815e85231b281 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 18 Sep 2012 23:57:00 +0100 Subject: Add openmetaverse_data from libopenmetaverse to allow testing of texture baking via bot rather than just throwing out errors --- bin/openmetaverse_data/avatar_lad.xml | 12308 +++++++++++++++++++ bin/openmetaverse_data/blush_alpha.tga | Bin 0 -> 17352 bytes bin/openmetaverse_data/body_skingrain.tga | Bin 0 -> 262188 bytes bin/openmetaverse_data/bodyfreckles_alpha.tga | Bin 0 -> 257249 bytes bin/openmetaverse_data/bump_face_wrinkles.tga | Bin 0 -> 25243 bytes bin/openmetaverse_data/bump_head_base.tga | Bin 0 -> 105525 bytes bin/openmetaverse_data/bump_lowerbody_base.tga | Bin 0 -> 112782 bytes bin/openmetaverse_data/bump_pants_wrinkles.tga | Bin 0 -> 83183 bytes bin/openmetaverse_data/bump_shirt_wrinkles.tga | Bin 0 -> 81501 bytes bin/openmetaverse_data/bump_upperbody_base.tga | Bin 0 -> 147581 bytes bin/openmetaverse_data/eyebrows_alpha.tga | Bin 0 -> 9469 bytes bin/openmetaverse_data/eyeliner_alpha.tga | Bin 0 -> 4720 bytes bin/openmetaverse_data/eyeshadow_inner_alpha.tga | Bin 0 -> 5466 bytes bin/openmetaverse_data/eyeshadow_outer_alpha.tga | Bin 0 -> 7382 bytes bin/openmetaverse_data/eyewhite.tga | Bin 0 -> 42353 bytes .../facehair_chincurtains_alpha.tga | Bin 0 -> 34610 bytes .../facehair_moustache_alpha.tga | Bin 0 -> 14017 bytes .../facehair_sideburns_alpha.tga | Bin 0 -> 27328 bytes .../facehair_soulpatch_alpha.tga | Bin 0 -> 11277 bytes bin/openmetaverse_data/freckles_alpha.tga | Bin 0 -> 140558 bytes bin/openmetaverse_data/glove_length_alpha.tga | Bin 0 -> 49745 bytes bin/openmetaverse_data/gloves_fingers_alpha.tga | Bin 0 -> 39616 bytes bin/openmetaverse_data/head_alpha.tga | Bin 0 -> 6066 bytes bin/openmetaverse_data/head_color.tga | Bin 0 -> 70715 bytes bin/openmetaverse_data/head_hair.tga | Bin 0 -> 75600 bytes bin/openmetaverse_data/head_highlights_alpha.tga | Bin 0 -> 20503 bytes bin/openmetaverse_data/head_shading_alpha.tga | Bin 0 -> 35304 bytes bin/openmetaverse_data/head_skingrain.tga | Bin 0 -> 262376 bytes .../jacket_length_lower_alpha.tga | Bin 0 -> 9768 bytes .../jacket_length_upper_alpha.tga | Bin 0 -> 14617 bytes bin/openmetaverse_data/jacket_open_lower_alpha.tga | Bin 0 -> 19732 bytes bin/openmetaverse_data/jacket_open_upper_alpha.tga | Bin 0 -> 41606 bytes bin/openmetaverse_data/lipgloss_alpha.tga | Bin 0 -> 4738 bytes bin/openmetaverse_data/lips_mask.tga | Bin 0 -> 6110 bytes bin/openmetaverse_data/lipstick_alpha.tga | Bin 0 -> 7966 bytes bin/openmetaverse_data/lowerbody_color.tga | Bin 0 -> 135395 bytes .../lowerbody_highlights_alpha.tga | Bin 0 -> 8695 bytes bin/openmetaverse_data/lowerbody_shading_alpha.tga | Bin 0 -> 41766 bytes bin/openmetaverse_data/nailpolish_alpha.tga | Bin 0 -> 4656 bytes bin/openmetaverse_data/pants_length_alpha.tga | Bin 0 -> 26843 bytes bin/openmetaverse_data/pants_waist_alpha.tga | Bin 0 -> 10487 bytes bin/openmetaverse_data/rosyface_alpha.tga | Bin 0 -> 44382 bytes bin/openmetaverse_data/rouge_alpha.tga | Bin 0 -> 44382 bytes bin/openmetaverse_data/shirt_bottom_alpha.tga | Bin 0 -> 32242 bytes bin/openmetaverse_data/shirt_collar_alpha.tga | Bin 0 -> 14417 bytes bin/openmetaverse_data/shirt_collar_back_alpha.tga | Bin 0 -> 12789 bytes bin/openmetaverse_data/shirt_sleeve_alpha.tga | Bin 0 -> 72196 bytes bin/openmetaverse_data/shoe_height_alpha.tga | Bin 0 -> 24461 bytes bin/openmetaverse_data/skirt_length_alpha.tga | Bin 0 -> 4114 bytes bin/openmetaverse_data/skirt_slit_back_alpha.tga | Bin 0 -> 90350 bytes bin/openmetaverse_data/skirt_slit_front_alpha.tga | Bin 0 -> 90350 bytes bin/openmetaverse_data/skirt_slit_left_alpha.tga | Bin 0 -> 82006 bytes bin/openmetaverse_data/skirt_slit_right_alpha.tga | Bin 0 -> 91410 bytes bin/openmetaverse_data/underpants_trial_female.tga | Bin 0 -> 48063 bytes bin/openmetaverse_data/underpants_trial_male.tga | Bin 0 -> 144983 bytes bin/openmetaverse_data/undershirt_trial_female.tga | Bin 0 -> 81390 bytes bin/openmetaverse_data/upperbody_color.tga | Bin 0 -> 23348 bytes .../upperbody_highlights_alpha.tga | Bin 0 -> 6509 bytes bin/openmetaverse_data/upperbody_shading_alpha.tga | Bin 0 -> 25297 bytes bin/openmetaverse_data/upperbodyfreckles_alpha.tga | Bin 0 -> 180104 bytes 60 files changed, 12308 insertions(+) create mode 100644 bin/openmetaverse_data/avatar_lad.xml create mode 100644 bin/openmetaverse_data/blush_alpha.tga create mode 100644 bin/openmetaverse_data/body_skingrain.tga create mode 100644 bin/openmetaverse_data/bodyfreckles_alpha.tga create mode 100644 bin/openmetaverse_data/bump_face_wrinkles.tga create mode 100644 bin/openmetaverse_data/bump_head_base.tga create mode 100644 bin/openmetaverse_data/bump_lowerbody_base.tga create mode 100644 bin/openmetaverse_data/bump_pants_wrinkles.tga create mode 100644 bin/openmetaverse_data/bump_shirt_wrinkles.tga create mode 100644 bin/openmetaverse_data/bump_upperbody_base.tga create mode 100644 bin/openmetaverse_data/eyebrows_alpha.tga create mode 100644 bin/openmetaverse_data/eyeliner_alpha.tga create mode 100644 bin/openmetaverse_data/eyeshadow_inner_alpha.tga create mode 100644 bin/openmetaverse_data/eyeshadow_outer_alpha.tga create mode 100644 bin/openmetaverse_data/eyewhite.tga create mode 100644 bin/openmetaverse_data/facehair_chincurtains_alpha.tga create mode 100644 bin/openmetaverse_data/facehair_moustache_alpha.tga create mode 100644 bin/openmetaverse_data/facehair_sideburns_alpha.tga create mode 100644 bin/openmetaverse_data/facehair_soulpatch_alpha.tga create mode 100644 bin/openmetaverse_data/freckles_alpha.tga create mode 100644 bin/openmetaverse_data/glove_length_alpha.tga create mode 100644 bin/openmetaverse_data/gloves_fingers_alpha.tga create mode 100644 bin/openmetaverse_data/head_alpha.tga create mode 100644 bin/openmetaverse_data/head_color.tga create mode 100644 bin/openmetaverse_data/head_hair.tga create mode 100644 bin/openmetaverse_data/head_highlights_alpha.tga create mode 100644 bin/openmetaverse_data/head_shading_alpha.tga create mode 100644 bin/openmetaverse_data/head_skingrain.tga create mode 100644 bin/openmetaverse_data/jacket_length_lower_alpha.tga create mode 100644 bin/openmetaverse_data/jacket_length_upper_alpha.tga create mode 100644 bin/openmetaverse_data/jacket_open_lower_alpha.tga create mode 100644 bin/openmetaverse_data/jacket_open_upper_alpha.tga create mode 100644 bin/openmetaverse_data/lipgloss_alpha.tga create mode 100644 bin/openmetaverse_data/lips_mask.tga create mode 100644 bin/openmetaverse_data/lipstick_alpha.tga create mode 100644 bin/openmetaverse_data/lowerbody_color.tga create mode 100644 bin/openmetaverse_data/lowerbody_highlights_alpha.tga create mode 100644 bin/openmetaverse_data/lowerbody_shading_alpha.tga create mode 100644 bin/openmetaverse_data/nailpolish_alpha.tga create mode 100644 bin/openmetaverse_data/pants_length_alpha.tga create mode 100644 bin/openmetaverse_data/pants_waist_alpha.tga create mode 100644 bin/openmetaverse_data/rosyface_alpha.tga create mode 100644 bin/openmetaverse_data/rouge_alpha.tga create mode 100644 bin/openmetaverse_data/shirt_bottom_alpha.tga create mode 100644 bin/openmetaverse_data/shirt_collar_alpha.tga create mode 100644 bin/openmetaverse_data/shirt_collar_back_alpha.tga create mode 100644 bin/openmetaverse_data/shirt_sleeve_alpha.tga create mode 100644 bin/openmetaverse_data/shoe_height_alpha.tga create mode 100644 bin/openmetaverse_data/skirt_length_alpha.tga create mode 100644 bin/openmetaverse_data/skirt_slit_back_alpha.tga create mode 100644 bin/openmetaverse_data/skirt_slit_front_alpha.tga create mode 100644 bin/openmetaverse_data/skirt_slit_left_alpha.tga create mode 100644 bin/openmetaverse_data/skirt_slit_right_alpha.tga create mode 100644 bin/openmetaverse_data/underpants_trial_female.tga create mode 100644 bin/openmetaverse_data/underpants_trial_male.tga create mode 100644 bin/openmetaverse_data/undershirt_trial_female.tga create mode 100644 bin/openmetaverse_data/upperbody_color.tga create mode 100644 bin/openmetaverse_data/upperbody_highlights_alpha.tga create mode 100644 bin/openmetaverse_data/upperbody_shading_alpha.tga create mode 100644 bin/openmetaverse_data/upperbodyfreckles_alpha.tga (limited to 'bin') diff --git a/bin/openmetaverse_data/avatar_lad.xml b/bin/openmetaverse_data/avatar_lad.xml new file mode 100644 index 0000000..3bd7ba7 --- /dev/null +++ b/bin/openmetaverse_data/avatar_lad.xml @@ -0,0 +1,12308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/openmetaverse_data/blush_alpha.tga b/bin/openmetaverse_data/blush_alpha.tga new file mode 100644 index 0000000..05be7e7 Binary files /dev/null and b/bin/openmetaverse_data/blush_alpha.tga differ diff --git a/bin/openmetaverse_data/body_skingrain.tga b/bin/openmetaverse_data/body_skingrain.tga new file mode 100644 index 0000000..7264baa Binary files /dev/null and b/bin/openmetaverse_data/body_skingrain.tga differ diff --git a/bin/openmetaverse_data/bodyfreckles_alpha.tga b/bin/openmetaverse_data/bodyfreckles_alpha.tga new file mode 100644 index 0000000..d30ab3d Binary files /dev/null and b/bin/openmetaverse_data/bodyfreckles_alpha.tga differ diff --git a/bin/openmetaverse_data/bump_face_wrinkles.tga b/bin/openmetaverse_data/bump_face_wrinkles.tga new file mode 100644 index 0000000..54bf7a5 Binary files /dev/null and b/bin/openmetaverse_data/bump_face_wrinkles.tga differ diff --git a/bin/openmetaverse_data/bump_head_base.tga b/bin/openmetaverse_data/bump_head_base.tga new file mode 100644 index 0000000..fa35685 Binary files /dev/null and b/bin/openmetaverse_data/bump_head_base.tga differ diff --git a/bin/openmetaverse_data/bump_lowerbody_base.tga b/bin/openmetaverse_data/bump_lowerbody_base.tga new file mode 100644 index 0000000..498ea3c Binary files /dev/null and b/bin/openmetaverse_data/bump_lowerbody_base.tga differ diff --git a/bin/openmetaverse_data/bump_pants_wrinkles.tga b/bin/openmetaverse_data/bump_pants_wrinkles.tga new file mode 100644 index 0000000..cca7241 Binary files /dev/null and b/bin/openmetaverse_data/bump_pants_wrinkles.tga differ diff --git a/bin/openmetaverse_data/bump_shirt_wrinkles.tga b/bin/openmetaverse_data/bump_shirt_wrinkles.tga new file mode 100644 index 0000000..9e0d757 Binary files /dev/null and b/bin/openmetaverse_data/bump_shirt_wrinkles.tga differ diff --git a/bin/openmetaverse_data/bump_upperbody_base.tga b/bin/openmetaverse_data/bump_upperbody_base.tga new file mode 100644 index 0000000..e57d635 Binary files /dev/null and b/bin/openmetaverse_data/bump_upperbody_base.tga differ diff --git a/bin/openmetaverse_data/eyebrows_alpha.tga b/bin/openmetaverse_data/eyebrows_alpha.tga new file mode 100644 index 0000000..c363e48 Binary files /dev/null and b/bin/openmetaverse_data/eyebrows_alpha.tga differ diff --git a/bin/openmetaverse_data/eyeliner_alpha.tga b/bin/openmetaverse_data/eyeliner_alpha.tga new file mode 100644 index 0000000..1611eb3 Binary files /dev/null and b/bin/openmetaverse_data/eyeliner_alpha.tga differ diff --git a/bin/openmetaverse_data/eyeshadow_inner_alpha.tga b/bin/openmetaverse_data/eyeshadow_inner_alpha.tga new file mode 100644 index 0000000..37d7919 Binary files /dev/null and b/bin/openmetaverse_data/eyeshadow_inner_alpha.tga differ diff --git a/bin/openmetaverse_data/eyeshadow_outer_alpha.tga b/bin/openmetaverse_data/eyeshadow_outer_alpha.tga new file mode 100644 index 0000000..00eef9d Binary files /dev/null and b/bin/openmetaverse_data/eyeshadow_outer_alpha.tga differ diff --git a/bin/openmetaverse_data/eyewhite.tga b/bin/openmetaverse_data/eyewhite.tga new file mode 100644 index 0000000..a720496 Binary files /dev/null and b/bin/openmetaverse_data/eyewhite.tga differ diff --git a/bin/openmetaverse_data/facehair_chincurtains_alpha.tga b/bin/openmetaverse_data/facehair_chincurtains_alpha.tga new file mode 100644 index 0000000..b103970 Binary files /dev/null and b/bin/openmetaverse_data/facehair_chincurtains_alpha.tga differ diff --git a/bin/openmetaverse_data/facehair_moustache_alpha.tga b/bin/openmetaverse_data/facehair_moustache_alpha.tga new file mode 100644 index 0000000..4068c4f Binary files /dev/null and b/bin/openmetaverse_data/facehair_moustache_alpha.tga differ diff --git a/bin/openmetaverse_data/facehair_sideburns_alpha.tga b/bin/openmetaverse_data/facehair_sideburns_alpha.tga new file mode 100644 index 0000000..acddc2d Binary files /dev/null and b/bin/openmetaverse_data/facehair_sideburns_alpha.tga differ diff --git a/bin/openmetaverse_data/facehair_soulpatch_alpha.tga b/bin/openmetaverse_data/facehair_soulpatch_alpha.tga new file mode 100644 index 0000000..687091a Binary files /dev/null and b/bin/openmetaverse_data/facehair_soulpatch_alpha.tga differ diff --git a/bin/openmetaverse_data/freckles_alpha.tga b/bin/openmetaverse_data/freckles_alpha.tga new file mode 100644 index 0000000..a9a4ec0 Binary files /dev/null and b/bin/openmetaverse_data/freckles_alpha.tga differ diff --git a/bin/openmetaverse_data/glove_length_alpha.tga b/bin/openmetaverse_data/glove_length_alpha.tga new file mode 100644 index 0000000..db89ad5 Binary files /dev/null and b/bin/openmetaverse_data/glove_length_alpha.tga differ diff --git a/bin/openmetaverse_data/gloves_fingers_alpha.tga b/bin/openmetaverse_data/gloves_fingers_alpha.tga new file mode 100644 index 0000000..dba2eec Binary files /dev/null and b/bin/openmetaverse_data/gloves_fingers_alpha.tga differ diff --git a/bin/openmetaverse_data/head_alpha.tga b/bin/openmetaverse_data/head_alpha.tga new file mode 100644 index 0000000..8164525 Binary files /dev/null and b/bin/openmetaverse_data/head_alpha.tga differ diff --git a/bin/openmetaverse_data/head_color.tga b/bin/openmetaverse_data/head_color.tga new file mode 100644 index 0000000..74b1b30 Binary files /dev/null and b/bin/openmetaverse_data/head_color.tga differ diff --git a/bin/openmetaverse_data/head_hair.tga b/bin/openmetaverse_data/head_hair.tga new file mode 100644 index 0000000..5321f35 Binary files /dev/null and b/bin/openmetaverse_data/head_hair.tga differ diff --git a/bin/openmetaverse_data/head_highlights_alpha.tga b/bin/openmetaverse_data/head_highlights_alpha.tga new file mode 100644 index 0000000..8dc5239 Binary files /dev/null and b/bin/openmetaverse_data/head_highlights_alpha.tga differ diff --git a/bin/openmetaverse_data/head_shading_alpha.tga b/bin/openmetaverse_data/head_shading_alpha.tga new file mode 100644 index 0000000..e8ea490 Binary files /dev/null and b/bin/openmetaverse_data/head_shading_alpha.tga differ diff --git a/bin/openmetaverse_data/head_skingrain.tga b/bin/openmetaverse_data/head_skingrain.tga new file mode 100644 index 0000000..b42dee0 Binary files /dev/null and b/bin/openmetaverse_data/head_skingrain.tga differ diff --git a/bin/openmetaverse_data/jacket_length_lower_alpha.tga b/bin/openmetaverse_data/jacket_length_lower_alpha.tga new file mode 100644 index 0000000..722bc19 Binary files /dev/null and b/bin/openmetaverse_data/jacket_length_lower_alpha.tga differ diff --git a/bin/openmetaverse_data/jacket_length_upper_alpha.tga b/bin/openmetaverse_data/jacket_length_upper_alpha.tga new file mode 100644 index 0000000..e9db7e7 Binary files /dev/null and b/bin/openmetaverse_data/jacket_length_upper_alpha.tga differ diff --git a/bin/openmetaverse_data/jacket_open_lower_alpha.tga b/bin/openmetaverse_data/jacket_open_lower_alpha.tga new file mode 100644 index 0000000..db0c2fb Binary files /dev/null and b/bin/openmetaverse_data/jacket_open_lower_alpha.tga differ diff --git a/bin/openmetaverse_data/jacket_open_upper_alpha.tga b/bin/openmetaverse_data/jacket_open_upper_alpha.tga new file mode 100644 index 0000000..71b8a0b Binary files /dev/null and b/bin/openmetaverse_data/jacket_open_upper_alpha.tga differ diff --git a/bin/openmetaverse_data/lipgloss_alpha.tga b/bin/openmetaverse_data/lipgloss_alpha.tga new file mode 100644 index 0000000..78ceeca Binary files /dev/null and b/bin/openmetaverse_data/lipgloss_alpha.tga differ diff --git a/bin/openmetaverse_data/lips_mask.tga b/bin/openmetaverse_data/lips_mask.tga new file mode 100644 index 0000000..ae1401c Binary files /dev/null and b/bin/openmetaverse_data/lips_mask.tga differ diff --git a/bin/openmetaverse_data/lipstick_alpha.tga b/bin/openmetaverse_data/lipstick_alpha.tga new file mode 100644 index 0000000..2795f1b Binary files /dev/null and b/bin/openmetaverse_data/lipstick_alpha.tga differ diff --git a/bin/openmetaverse_data/lowerbody_color.tga b/bin/openmetaverse_data/lowerbody_color.tga new file mode 100644 index 0000000..a63aa12 Binary files /dev/null and b/bin/openmetaverse_data/lowerbody_color.tga differ diff --git a/bin/openmetaverse_data/lowerbody_highlights_alpha.tga b/bin/openmetaverse_data/lowerbody_highlights_alpha.tga new file mode 100644 index 0000000..ae3413a Binary files /dev/null and b/bin/openmetaverse_data/lowerbody_highlights_alpha.tga differ diff --git a/bin/openmetaverse_data/lowerbody_shading_alpha.tga b/bin/openmetaverse_data/lowerbody_shading_alpha.tga new file mode 100644 index 0000000..0242663 Binary files /dev/null and b/bin/openmetaverse_data/lowerbody_shading_alpha.tga differ diff --git a/bin/openmetaverse_data/nailpolish_alpha.tga b/bin/openmetaverse_data/nailpolish_alpha.tga new file mode 100644 index 0000000..91af762 Binary files /dev/null and b/bin/openmetaverse_data/nailpolish_alpha.tga differ diff --git a/bin/openmetaverse_data/pants_length_alpha.tga b/bin/openmetaverse_data/pants_length_alpha.tga new file mode 100644 index 0000000..3c4f21c Binary files /dev/null and b/bin/openmetaverse_data/pants_length_alpha.tga differ diff --git a/bin/openmetaverse_data/pants_waist_alpha.tga b/bin/openmetaverse_data/pants_waist_alpha.tga new file mode 100644 index 0000000..35658c0 Binary files /dev/null and b/bin/openmetaverse_data/pants_waist_alpha.tga differ diff --git a/bin/openmetaverse_data/rosyface_alpha.tga b/bin/openmetaverse_data/rosyface_alpha.tga new file mode 100644 index 0000000..a0c8513 Binary files /dev/null and b/bin/openmetaverse_data/rosyface_alpha.tga differ diff --git a/bin/openmetaverse_data/rouge_alpha.tga b/bin/openmetaverse_data/rouge_alpha.tga new file mode 100644 index 0000000..a0c8513 Binary files /dev/null and b/bin/openmetaverse_data/rouge_alpha.tga differ diff --git a/bin/openmetaverse_data/shirt_bottom_alpha.tga b/bin/openmetaverse_data/shirt_bottom_alpha.tga new file mode 100644 index 0000000..7cce03d Binary files /dev/null and b/bin/openmetaverse_data/shirt_bottom_alpha.tga differ diff --git a/bin/openmetaverse_data/shirt_collar_alpha.tga b/bin/openmetaverse_data/shirt_collar_alpha.tga new file mode 100644 index 0000000..f55f635 Binary files /dev/null and b/bin/openmetaverse_data/shirt_collar_alpha.tga differ diff --git a/bin/openmetaverse_data/shirt_collar_back_alpha.tga b/bin/openmetaverse_data/shirt_collar_back_alpha.tga new file mode 100644 index 0000000..43a6453 Binary files /dev/null and b/bin/openmetaverse_data/shirt_collar_back_alpha.tga differ diff --git a/bin/openmetaverse_data/shirt_sleeve_alpha.tga b/bin/openmetaverse_data/shirt_sleeve_alpha.tga new file mode 100644 index 0000000..e3b18f4 Binary files /dev/null and b/bin/openmetaverse_data/shirt_sleeve_alpha.tga differ diff --git a/bin/openmetaverse_data/shoe_height_alpha.tga b/bin/openmetaverse_data/shoe_height_alpha.tga new file mode 100644 index 0000000..d08dd75 Binary files /dev/null and b/bin/openmetaverse_data/shoe_height_alpha.tga differ diff --git a/bin/openmetaverse_data/skirt_length_alpha.tga b/bin/openmetaverse_data/skirt_length_alpha.tga new file mode 100644 index 0000000..c867994 Binary files /dev/null and b/bin/openmetaverse_data/skirt_length_alpha.tga differ diff --git a/bin/openmetaverse_data/skirt_slit_back_alpha.tga b/bin/openmetaverse_data/skirt_slit_back_alpha.tga new file mode 100644 index 0000000..0e49688 Binary files /dev/null and b/bin/openmetaverse_data/skirt_slit_back_alpha.tga differ diff --git a/bin/openmetaverse_data/skirt_slit_front_alpha.tga b/bin/openmetaverse_data/skirt_slit_front_alpha.tga new file mode 100644 index 0000000..888bbf7 Binary files /dev/null and b/bin/openmetaverse_data/skirt_slit_front_alpha.tga differ diff --git a/bin/openmetaverse_data/skirt_slit_left_alpha.tga b/bin/openmetaverse_data/skirt_slit_left_alpha.tga new file mode 100644 index 0000000..210feac Binary files /dev/null and b/bin/openmetaverse_data/skirt_slit_left_alpha.tga differ diff --git a/bin/openmetaverse_data/skirt_slit_right_alpha.tga b/bin/openmetaverse_data/skirt_slit_right_alpha.tga new file mode 100644 index 0000000..ce11c64 Binary files /dev/null and b/bin/openmetaverse_data/skirt_slit_right_alpha.tga differ diff --git a/bin/openmetaverse_data/underpants_trial_female.tga b/bin/openmetaverse_data/underpants_trial_female.tga new file mode 100644 index 0000000..96bf732 Binary files /dev/null and b/bin/openmetaverse_data/underpants_trial_female.tga differ diff --git a/bin/openmetaverse_data/underpants_trial_male.tga b/bin/openmetaverse_data/underpants_trial_male.tga new file mode 100644 index 0000000..095695c Binary files /dev/null and b/bin/openmetaverse_data/underpants_trial_male.tga differ diff --git a/bin/openmetaverse_data/undershirt_trial_female.tga b/bin/openmetaverse_data/undershirt_trial_female.tga new file mode 100644 index 0000000..e17a309 Binary files /dev/null and b/bin/openmetaverse_data/undershirt_trial_female.tga differ diff --git a/bin/openmetaverse_data/upperbody_color.tga b/bin/openmetaverse_data/upperbody_color.tga new file mode 100644 index 0000000..85fcc41 Binary files /dev/null and b/bin/openmetaverse_data/upperbody_color.tga differ diff --git a/bin/openmetaverse_data/upperbody_highlights_alpha.tga b/bin/openmetaverse_data/upperbody_highlights_alpha.tga new file mode 100644 index 0000000..2d8102b Binary files /dev/null and b/bin/openmetaverse_data/upperbody_highlights_alpha.tga differ diff --git a/bin/openmetaverse_data/upperbody_shading_alpha.tga b/bin/openmetaverse_data/upperbody_shading_alpha.tga new file mode 100644 index 0000000..b420506 Binary files /dev/null and b/bin/openmetaverse_data/upperbody_shading_alpha.tga differ diff --git a/bin/openmetaverse_data/upperbodyfreckles_alpha.tga b/bin/openmetaverse_data/upperbodyfreckles_alpha.tga new file mode 100644 index 0000000..76c7ce8 Binary files /dev/null and b/bin/openmetaverse_data/upperbodyfreckles_alpha.tga differ -- cgit v1.1 From e50155ebca0538ddcbd579ef13feb6581e4220b8 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 19 Sep 2012 00:35:06 +0100 Subject: Downgrade libopenjpeg back to 1.3 from 1.5. This is because libopenjpeg 1.5 appears to require a minimum of glibc 2.14, whereas at least one fairly recent distro (openSUSE 11.4 from 2011-03-10) only has glibc Further investigation pending. --- bin/lib32/libopenjpeg-dotnet.so | Bin 139088 -> 124540 bytes bin/lib64/libopenjpeg-dotnet-x86_64.so | Bin 149392 -> 142616 bytes bin/lib64/libopenjpeg-dotnet.dylib | Bin 147288 -> 125136 bytes bin/openjpeg-dotnet-x86_64.dll | Bin 215040 -> 843776 bytes bin/openjpeg-dotnet.dll | Bin 201216 -> 187392 bytes 5 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/lib32/libopenjpeg-dotnet.so b/bin/lib32/libopenjpeg-dotnet.so index 5914368..0106b56 100755 Binary files a/bin/lib32/libopenjpeg-dotnet.so and b/bin/lib32/libopenjpeg-dotnet.so differ diff --git a/bin/lib64/libopenjpeg-dotnet-x86_64.so b/bin/lib64/libopenjpeg-dotnet-x86_64.so index 421dc56..be11bb4 100755 Binary files a/bin/lib64/libopenjpeg-dotnet-x86_64.so and b/bin/lib64/libopenjpeg-dotnet-x86_64.so differ diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib index 18ca868..dc50775 100755 Binary files a/bin/lib64/libopenjpeg-dotnet.dylib and b/bin/lib64/libopenjpeg-dotnet.dylib differ diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll index 9e8cd21..97729ff 100755 Binary files a/bin/openjpeg-dotnet-x86_64.dll and b/bin/openjpeg-dotnet-x86_64.dll differ diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll index 6377b8d..64b2557 100755 Binary files a/bin/openjpeg-dotnet.dll and b/bin/openjpeg-dotnet.dll differ -- cgit v1.1 From e50b6b5334270436ece8c2c5bdfe792395d044bf Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 20 Sep 2012 01:26:35 +0100 Subject: Update libopenjpeg libraries used by libopenmetaverse back up to 1.5, this time using lkalif's linux libraries built against a much earlier libc (2.7) --- bin/lib32/libopenjpeg-dotnet.so | Bin 124540 -> 140028 bytes bin/lib64/libopenjpeg-dotnet-x86_64.so | Bin 142616 -> 149368 bytes bin/lib64/libopenjpeg-dotnet.dylib | Bin 125136 -> 147288 bytes bin/openjpeg-dotnet-x86_64.dll | Bin 843776 -> 215040 bytes bin/openjpeg-dotnet.dll | Bin 187392 -> 201216 bytes 5 files changed, 0 insertions(+), 0 deletions(-) (limited to 'bin') diff --git a/bin/lib32/libopenjpeg-dotnet.so b/bin/lib32/libopenjpeg-dotnet.so index 0106b56..193eca4 100755 Binary files a/bin/lib32/libopenjpeg-dotnet.so and b/bin/lib32/libopenjpeg-dotnet.so differ diff --git a/bin/lib64/libopenjpeg-dotnet-x86_64.so b/bin/lib64/libopenjpeg-dotnet-x86_64.so index be11bb4..7a9bdfc 100755 Binary files a/bin/lib64/libopenjpeg-dotnet-x86_64.so and b/bin/lib64/libopenjpeg-dotnet-x86_64.so differ diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib index dc50775..18ca868 100755 Binary files a/bin/lib64/libopenjpeg-dotnet.dylib and b/bin/lib64/libopenjpeg-dotnet.dylib differ diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll index 97729ff..9e8cd21 100755 Binary files a/bin/openjpeg-dotnet-x86_64.dll and b/bin/openjpeg-dotnet-x86_64.dll differ diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll index 64b2557..6377b8d 100755 Binary files a/bin/openjpeg-dotnet.dll and b/bin/openjpeg-dotnet.dll differ -- cgit v1.1 From f2a9d26118f87903564990ff220d642801767c25 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 20 Sep 2012 01:40:05 +0100 Subject: Make ResendAppearanceUpdates = true by default in [Appearance] in OpenSimDefaults.ini. This resends appearance uuids to avatars in the scene once a minute. I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet. The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached. This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000 --- bin/OpenSimDefaults.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index ef4f578..315ffbe 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -673,8 +673,7 @@ ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds. ; This may help with some situations where avatars are persistently grey, though it will not help ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others). - ; This setting is experimental. - ResendAppearanceUpdates = false + ResendAppearanceUpdates = true [Attachments] -- cgit v1.1 From 3089b6d824f1d4eb25ba12c5fd037153fdc92e1e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 20 Sep 2012 15:49:22 -0700 Subject: More HG2.0: Added permission policies in HGAsset Service based on asset types. The policies are given in the config. This is only half of the story. The other half, pertaining to exports/imports made by the sim, will be done next. --- bin/Robust.HG.ini.example | 10 ++++++++++ bin/config-include/StandaloneCommon.ini.example | 11 +++++++++++ 2 files changed, 21 insertions(+) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index fad399d..8218b14 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -437,6 +437,16 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" HomeURI = "http://127.0.0.1:8002" + ;; The asset types that other grids can get from / post to this service. + ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: + ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh + ;; + ;; Leave blank or commented if you don't want to apply any restrictions. + ;; A more strict, but still reasonable, policy may be to disallow the exchange + ;; of scripts, like so: + ; DisallowGET ="LSLText" + ; DisallowPOST ="LSLBytecode" + [HGFriendsService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService" UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index e4bc548..d8ecba8 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -53,6 +53,17 @@ [HGAssetService] HomeURI = "http://127.0.0.1:9000" + ;; The asset types that other grids can get from / post to this service. + ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: + ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh + ;; + ;; Leave blank or commented if you don't want to apply any restrictions. + ;; A more strict, but still reasonable, policy may be to disallow the exchange + ;; of scripts, like so: + ; DisallowGET ="LSLText" + ; DisallowPOST ="LSLBytecode" + + [HGInventoryAccessModule] HomeURI = "http://127.0.0.1:9000" Gatekeeper = "http://127.0.0.1:9000" -- cgit v1.1 From e379566e6e3bed0d7001f099a5ea8dfd648d76cf Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 20 Sep 2012 19:50:57 -0700 Subject: Improvement over last commit: refactor the asset permissions code, so that it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive --- bin/Robust.HG.ini.example | 10 ++++++---- bin/config-include/StandaloneCommon.ini.example | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 8218b14..399779d 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -437,15 +437,17 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" HomeURI = "http://127.0.0.1:8002" - ;; The asset types that other grids can get from / post to this service. + ;; The asset types that this service can export to / import from other grids. + ;; Comma separated. ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: - ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh + ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, + ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh ;; ;; Leave blank or commented if you don't want to apply any restrictions. ;; A more strict, but still reasonable, policy may be to disallow the exchange ;; of scripts, like so: - ; DisallowGET ="LSLText" - ; DisallowPOST ="LSLBytecode" + ; DisallowExport ="LSLText" + ; DisallowImport ="LSLBytecode" [HGFriendsService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGFriendsService" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index d8ecba8..d5eb50d 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -53,15 +53,17 @@ [HGAssetService] HomeURI = "http://127.0.0.1:9000" - ;; The asset types that other grids can get from / post to this service. + ;; The asset types that this service can export to / import from other grids. + ;; Comma separated. ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: - ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh + ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, + ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh ;; ;; Leave blank or commented if you don't want to apply any restrictions. ;; A more strict, but still reasonable, policy may be to disallow the exchange ;; of scripts, like so: - ; DisallowGET ="LSLText" - ; DisallowPOST ="LSLBytecode" + ; DisallowExport ="LSLText" + ; DisallowImport ="LSLBytecode" [HGInventoryAccessModule] -- cgit v1.1 From b542622b3a841e73f071aab563ba1e211c5a87e3 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 21 Sep 2012 07:44:18 -0700 Subject: HG 2.0: added asset import/export policies at the sim too. --- bin/Robust.HG.ini.example | 2 +- bin/config-include/GridCommon.ini.example | 20 ++++++++++++++++++++ bin/config-include/StandaloneCommon.ini.example | 2 +- 3 files changed, 22 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 399779d..afb3f6f 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -437,7 +437,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService" HomeURI = "http://127.0.0.1:8002" - ;; The asset types that this service can export to / import from other grids. + ;; The asset types that this grid can export to / import from other grids. ;; Comma separated. ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index 8d7f6fc..79f7ed6 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -137,6 +137,26 @@ ;; uncomment the next line. You may want to do this on sims that have licensed content. ; OutboundPermission = False +[HGAssetService] + ; + ; === HG ONLY === + ; Change this to your server + ; accessible from other grids + ; + HomeURI = "http://mygridserver.com:8002" + + ;; The asset types that this grid can export to / import from other grids. + ;; Comma separated. + ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: + ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, + ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh + ;; + ;; Leave blank or commented if you don't want to apply any restrictions. + ;; A more strict, but still reasonable, policy may be to disallow the exchange + ;; of scripts, like so: + ; DisallowExport ="LSLText" + ; DisallowImport ="LSLBytecode" + [HGFriendsModule] ; User level required to be able to send friendship invitations to foreign users ;LevelHGFriends = 0; diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index d5eb50d..048710a 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -53,7 +53,7 @@ [HGAssetService] HomeURI = "http://127.0.0.1:9000" - ;; The asset types that this service can export to / import from other grids. + ;; The asset types that this grid can export to / import from other grids. ;; Comma separated. ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely: ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, -- cgit v1.1 From 48f4b32d7f23c2d7a52db355017c8b2bb57b55fa Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 21 Sep 2012 21:03:14 -0700 Subject: More HG 2.0: access control at the Gatekeeper. \o/ --- bin/Robust.HG.ini.example | 12 ++++++++++++ bin/config-include/StandaloneCommon.ini.example | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index afb3f6f..1bafdbd 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -396,6 +396,18 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ;AllowedClients = "" ;DeniedClients = "" + ;; Are foreign visitors allowed? + ;ForeignAgentsAllowed = true + ;; + ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept. + ;; Leave blank or commented for no exceptions. + ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002" + ;; + ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept + ;; Leave blank or commented for no exceptions. + ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002" + + [UserAgentService] LocalServiceModule = "OpenSim.Services.HypergridService.dll:UserAgentService" ;; for the service diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 048710a..4339cb1 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -164,8 +164,17 @@ ;AllowedClients = "" ;DeniedClients = "" - ;; Are foreign visitors allowed + ;; Are foreign visitors allowed? ;ForeignAgentsAllowed = true + ;; + ;; If ForeignAgentsAllowed is true, make exceptions using AllowExcept. + ;; Leave blank or commented for no exceptions. + ; AllowExcept = "http://griefer.com:8002, http://enemy.com:8002" + ;; + ;; If ForeignAgentsAllowed is false, make exceptions using DisallowExcept + ;; Leave blank or commented for no exceptions. + ; DisallowExcept = "http://myfriendgrid.com:8002, http://myboss.com:8002" + [FreeswitchService] ;; If FreeSWITCH is not being used then you don't need to set any of these parameters -- cgit v1.1 From fb6d6e5cca8e283025ef80cfd29a97bc5882550d Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 22 Sep 2012 11:11:48 -0700 Subject: HG 2.0: User Agent Service now can also control where the local users can go. Domain-name and user-level based. \o/ --- bin/Robust.HG.ini.example | 18 ++++++++++++++++++ bin/config-include/StandaloneCommon.ini.example | 19 ++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example index 1bafdbd..18094b7 100644 --- a/bin/Robust.HG.ini.example +++ b/bin/Robust.HG.ini.example @@ -428,6 +428,24 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003 ; User level required to be contacted from other grids ;LevelOutsideContacts = 0 + ;; Restrictions on destinations of local users. + ;; Are local users allowed to visit other grids? + ;; What user level? Use variables of this forrm: + ;; ForeignTripsAllowed_Level_ = true | false + ;; (the default is true) + ;; For example: + ; ForeignTripsAllowed_Level_0 = false + ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it + ;; + ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept + ;; Leave blank or commented for no exceptions. + ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002" + ;; + ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept. + ;; Leave blank or commented for no exceptions. + ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" + + ; * The interface that local users get when they are in other grids. ; * This restricts the inventory operations while in other grids. ; * Still not completely safe, especially if users perform inventory operations diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 4339cb1..84de0ec 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -280,5 +280,22 @@ ; Region_Test_1 = "DisallowForeigners" [UserAgentService] - ; User level required to be contacted from other grids + ;; User level required to be contacted from other grids ;LevelOutsideContacts = 0 + + ;; Restrictions on destinations of local users. + ;; Are local users allowed to visit other grids? + ;; What user level? Use variables of this forrm: + ;; ForeignTripsAllowed_Level_ = true | false + ;; (the default is true) + ;; For example: + ; ForeignTripsAllowed_Level_0 = false + ; ForeignTripsAllowed_Level_200 = true ; true is default, no need to say it + ;; + ;; If ForeignTripsAllowed is false, make exceptions using DisallowExcept + ;; Leave blank or commented for no exceptions. + ; DisallowExcept_Level_0 = "http://myothergrid.com:8002, http://boss.com:8002" + ;; + ;; If ForeignTripsAllowed is true, make exceptions using AllowExcept. + ;; Leave blank or commented for no exceptions. + ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002" -- cgit v1.1