From fb6aa6eafc476ff7c2987395cd8c9c8d8fb4e827 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Sat, 27 Oct 2007 11:45:52 +0000 Subject: [PATCH] * Added 'Jim' and 'Goblin' shapes; not available in inventory yet though --- .../Communications/Cache/AssetTransactions.cs | 4 +- bin/OpenSimAssetSet.xml | 30 + bin/OpenSimLibrary.xml | 1080 ++++++++--------- bin/assets/goblin_skin.dat | 49 + bin/assets/jim_shape.dat | 105 ++ bin/assets/jim_skin.dat | 50 + bin/assets/little_goblin_shape.dat | 105 ++ 7 files changed, 882 insertions(+), 541 deletions(-) create mode 100644 bin/assets/goblin_skin.dat create mode 100644 bin/assets/jim_shape.dat create mode 100644 bin/assets/jim_skin.dat create mode 100644 bin/assets/little_goblin_shape.dat diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs index 581e30085b..f23441ddb4 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs @@ -287,7 +287,9 @@ namespace OpenSim.Framework.Communications.Cache if (m_dumpAssetToFile) { - SaveAssetToFile("testudpupload" + Util.RandomClass.Next(1, 1000) + ".dat", this.Asset.Data); + DateTime now = DateTime.Now; + string filename = String.Format("{6}_{7}_{0:d2}{1:d2}{2:d2}_{3:d2}{4:d2}{5:d2}", now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second, Asset.Name, Asset.Type ); + SaveAssetToFile(filename, this.Asset.Data); } } diff --git a/bin/OpenSimAssetSet.xml b/bin/OpenSimAssetSet.xml index 07b8e8b253..10f3058962 100644 --- a/bin/OpenSimAssetSet.xml +++ b/bin/OpenSimAssetSet.xml @@ -423,6 +423,7 @@ +
@@ -430,6 +431,21 @@
+
+ + + + + +
+
+ + + + + +
+
@@ -437,6 +453,20 @@
+
+ + + + + +
+
+ + + + + +
diff --git a/bin/OpenSimLibrary.xml b/bin/OpenSimLibrary.xml index 97b21b0cc3..bfc21ffd9d 100644 --- a/bin/OpenSimLibrary.xml +++ b/bin/OpenSimLibrary.xml @@ -1,542 +1,542 @@ -
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
-
- - - - - - - - - - -
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+
+ + + + + + + + + + +
\ No newline at end of file diff --git a/bin/assets/goblin_skin.dat b/bin/assets/goblin_skin.dat new file mode 100644 index 0000000000..7a7ad8b866 --- /dev/null +++ b/bin/assets/goblin_skin.dat @@ -0,0 +1,49 @@ +LLWearable version 22 +Goblin Skin + + permissions 0 + { + base_mask 00080000 + owner_mask 00080000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00080000 + creator_id 15787b54-7833-4238-9c18-80ddd7687bfe + owner_id 15787b54-7833-4238-9c18-80ddd7687bfe + last_owner_id 15787b54-7833-4238-9c18-80ddd7687bfe + group_id 00000000-0000-0000-0000-000000000000 + } + sale_info 0 + { + sale_type not + sale_price 10 + } +type 1 +parameters 26 +108 .6 +110 .1 +111 1 +116 .68 +117 .28 +150 0 +162 1 +163 .99 +165 .69 +700 .51 +701 .2 +702 0 +703 0 +704 0 +705 .5 +706 .6 +707 0 +708 0 +709 0 +710 0 +711 .5 +712 0 +713 .7 +714 0 +715 0 +775 0 +textures 0 diff --git a/bin/assets/jim_shape.dat b/bin/assets/jim_shape.dat new file mode 100644 index 0000000000..733fc8c9b0 --- /dev/null +++ b/bin/assets/jim_shape.dat @@ -0,0 +1,105 @@ +LLWearable version 22 +Jim Shape + + permissions 0 + { + base_mask 00000000 + owner_mask 00000000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00000000 + creator_id 11111111-1111-0000-0000-000100bba000 + owner_id 11111111-1111-0000-0000-000100bba000 + last_owner_id 11111111-1111-0000-0000-000100bba000 + group_id 00000000-0000-0000-0000-000000000000 + } + sale_info 0 + { + sale_type not + sale_price 10 + } +type 0 +parameters 82 +1 0 +2 0 +4 0 +5 0 +6 0 +7 0 +8 0 +10 0 +11 0 +12 0 +13 0 +14 0 +15 0 +17 0 +18 0 +19 0 +20 0 +21 0 +22 0 +23 0 +24 0 +25 0 +27 0 +33 -2.3 +34 0 +35 0 +36 -.5 +37 -1.34 +38 0 +80 1 +105 .5 +155 0 +157 0 +185 0 +193 .5 +196 0 +505 .5 +506 0 +507 0 +515 0 +517 0 +518 0 +629 .5 +637 0 +646 0 +647 0 +649 .5 +650 0 +652 .29 +653 0 +656 0 +659 .5 +662 .5 +663 0 +664 0 +665 0 +675 0 +676 0 +678 .5 +682 .5 +683 -.15 +684 0 +685 0 +690 .5 +692 1 +693 .6 +753 0 +756 0 +758 0 +759 .5 +760 0 +764 0 +765 0 +769 .5 +773 .5 +795 .84 +796 0 +799 .5 +841 0 +842 0 +879 0 +880 0 +textures 0 diff --git a/bin/assets/jim_skin.dat b/bin/assets/jim_skin.dat new file mode 100644 index 0000000000..7d409c9c8d --- /dev/null +++ b/bin/assets/jim_skin.dat @@ -0,0 +1,50 @@ +LLWearable version 22 +Jim skin + + permissions 0 + { + base_mask 00000000 + owner_mask 00000000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00000000 + creator_id 11111111-1111-0000-0000-000100bba000 + owner_id 11111111-1111-0000-0000-000100bba000 + last_owner_id 11111111-1111-0000-0000-000100bba000 + group_id 00000000-0000-0000-0000-000000000000 + } + sale_info 0 + { + sale_type not + sale_price 10 + } +type 1 +parameters 26 +108 0 +110 0 +111 .5 +116 0 +117 0 +150 0 +162 0 +163 0 +165 0 +700 .25 +701 0 +702 0 +703 0 +704 0 +705 .5 +706 .6 +707 0 +708 0 +709 0 +710 0 +711 .5 +712 0 +713 .7 +714 0 +715 0 +775 0 +textures 0 + diff --git a/bin/assets/little_goblin_shape.dat b/bin/assets/little_goblin_shape.dat new file mode 100644 index 0000000000..752fb5599e --- /dev/null +++ b/bin/assets/little_goblin_shape.dat @@ -0,0 +1,105 @@ +LLWearable version 22 +See the little goblin + + permissions 0 + { + base_mask 00000000 + owner_mask 00000000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00000000 + creator_id 11111111-1111-0000-0000-000100bba000 + owner_id 11111111-1111-0000-0000-000100bba000 + last_owner_id 11111111-1111-0000-0000-000100bba000 + group_id 00000000-0000-0000-0000-000000000000 + } + sale_info 0 + { + sale_type not + sale_price 10 + } +type 0 +parameters 82 +1 0 +2 0 +4 0 +5 0 +6 0 +7 0 +8 0 +10 0 +11 0 +12 0 +13 0 +14 0 +15 1.5 +17 0 +18 0 +19 0 +20 0 +21 0 +22 0 +23 0 +24 2 +25 0 +27 0 +33 -2.3 +34 -.7 +35 2 +36 1.4 +37 .16 +38 -1 +80 1 +105 .5 +155 0 +157 .68 +185 0 +193 0 +196 0 +505 .5 +506 0 +507 0 +515 3 +517 .52 +518 0 +629 .5 +637 0 +646 -.4 +647 -.5 +649 .5 +650 0 +652 1 +653 0 +656 0 +659 .5 +662 .5 +663 0 +664 0 +665 0 +675 .3 +676 .95 +678 .74 +682 1 +683 .12 +684 0 +685 -.5 +690 .75 +692 -1 +693 -1 +753 2.34 +756 -1 +758 0 +759 .5 +760 0 +764 0 +765 0 +769 .5 +773 .5 +795 1 +796 3 +799 .5 +841 .66 +842 0 +879 -.5 +880 0 +textures 0