Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

# Conflicts:
#	indra/cmake/bugsplat.cmake
#	indra/newview/llappdelegate-objc.mm

indra/cmake/bugsplat.cmake

@@ -20,7 +20,7 @@ if (USE_BUGSPLAT)
         elseif (DARWIN)
             find_library(BUGSPLAT_LIBRARIES BugsplatMac REQUIRED
                 NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}")
-            message(FATAL_ERROR "Bugsplat for OSX not fully implemented, please adapt llappdelegate-objc.mm to honor options of sending user name and settings.xml.")
+            message("Bugsplat for OSX not fully implemented, please adapt llappdelegate-objc.mm to honor options of sending user name and settings.xml.")
         else (WINDOWS)
             message(FATAL_ERROR "BugSplat is not supported; add -DUSE_BUGSPLAT=OFF")
         endif (WINDOWS)

indra/llfilesystem/lldiskcache.cpp

@@ -62,6 +62,11 @@ LLDiskCache::LLDiskCache(const std::string cache_dir,
         LLFile::mkdir(dirname);
     }
     // </FS:Ansariel>
+    // <FS:Beq> add static assets into the new cache after clear.
+    // Only missing entries are copied on init, skiplist is setup
+    // For everything we populate FS specific assets to allow future updates
+    prepopulateCacheWithStatic();
+    // </FS:Beq>
 }
 
 void LLDiskCache::purge()
@@ -117,6 +122,11 @@ void LLDiskCache::purge()
 
     LL_INFOS() << "Purging cache to a maximum of " << mMaxSizeBytes << " bytes" << LL_ENDL;
 
+    // <FS:Beq> Extra accounting to track the retention of static assets
+    int keep{0};
+    int del{0};
+    int skip{0};
+    // </FS:Beq>
     uintmax_t file_size_total = 0;
     for (file_info_t& entry : file_info)
     {
@@ -126,17 +136,34 @@ void LLDiskCache::purge()
         if (file_size_total > mMaxSizeBytes)
         {
             action = "DELETE:";
-            // <FS:Ansariel> Do not crash if we cannot delete the file for some reason
-            //boost::filesystem::remove(entry.second.second);
-            boost::filesystem::remove(entry.second.second, ec);
-            if (ec.failed())
+            // <FS:Beq> Make sure static assets are not eliminated
+            auto uuid_as_string = gDirUtilp->getBaseFileName(entry.second.second,true);
+            uuid_as_string = uuid_as_string.substr(mCacheFilenamePrefix.size() + 1, 36);// skip "sl_cache_" and trailing "_N"        
+            // LL_INFOS() << "checking UUID=" <<uuid_as_string<< LL_ENDL;
+            if (std::find(mSkipList.begin(), mSkipList.end(), uuid_as_string) != mSkipList.end())
             {
-                LL_WARNS() << "Failed to delete cache file " << entry.second.second << ": " << ec.message() << LL_ENDL;
+                // this is one of our protected items so no purging
+                action = "STATIC:";
+                skip++;
+                updateFileAccessTime(entry.second.second); // force these to the front of the list next time so that purge size works 
+            }
+            else 
+            {
+                del++;    // Extra accounting to track the retention of static assets
+            // </FS:Beq>
+            // <FS:Ansariel> Do not crash if we cannot delete the file for some reason
+                //boost::filesystem::remove(entry.second.second);
+                boost::filesystem::remove(entry.second.second, ec);
+                if (ec.failed())
+                {
+                    LL_WARNS() << "Failed to delete cache file " << entry.second.second << ": " << ec.message() << LL_ENDL;
+                }
             }
             // </FS:Ansariel>
         }
         else
         {
+            keep++;    // <FS:Beq/> Extra accounting to track the retention of static assets
             action = "  KEEP:";
         }
 
@@ -160,6 +187,7 @@ void LLDiskCache::purge()
         auto execute_time = std::chrono::duration_cast<std::chrono::milliseconds>(end_time - start_time).count();
         LL_INFOS() << "Total dir size after purge is " << dirFileSize(mCacheDir) << LL_ENDL;
         LL_INFOS() << "Cache purge took " << execute_time << " ms to execute for " << file_info.size() << " files" << LL_ENDL;
+        LL_INFOS() << "Deleted: " << del << " Skipped: " << skip << " Kept: " << keep << LL_ENDL;    // <FS:Beq/> Extra accounting to track the retention of static assets
     }
 }
 
@@ -321,8 +349,57 @@ const std::string LLDiskCache::getCacheInfo()
     return cache_info.str();
 }
 
+// <FS:Beq> Copy static items into cache and add to the skip list that prevents their purging
+// Note that there is no de-duplication nor other validation of the list.
+void LLDiskCache::prepopulateCacheWithStatic()
+{
+    mSkipList.clear();
+
+    std::vector<std::string> from_folders;
+    from_folders.emplace_back(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "fs_static_assets"));
+#ifdef OPENSIM
+    from_folders.emplace_back(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "static_assets"));
+#endif
+
+    for (const auto& from_folder : from_folders)
+    {
+        if (gDirUtilp->fileExists(from_folder))
+        {
+            auto assets_to_copy = gDirUtilp->getFilesInDir(from_folder);
+            for (auto from_asset_file : assets_to_copy)
+            {
+                from_asset_file = from_folder + gDirUtilp->getDirDelimiter() + from_asset_file;
+                // we store static assets as UUID.asset_type the asset_type is not used in the current simple cache format
+                auto uuid_as_string{ gDirUtilp->getBaseFileName(from_asset_file, true) };
+                auto to_asset_file = metaDataToFilepath(uuid_as_string, LLAssetType::AT_UNKNOWN, std::string());
+                if (!gDirUtilp->fileExists(to_asset_file))
+                {
+                    if (mEnableCacheDebugInfo)
+                    {
+                        LL_INFOS("LLDiskCache") << "Copying static asset " << from_asset_file << " to cache from " << from_folder << LL_ENDL;
+                    }
+                    if (!LLFile::copy(from_asset_file, to_asset_file))
+                    {
+                        LL_WARNS("LLDiskCache") << "Failed to copy " << from_asset_file << " to " << to_asset_file << LL_ENDL;
+                    }
+                }
+                if (std::find(mSkipList.begin(), mSkipList.end(), uuid_as_string) == mSkipList.end())
+                {
+                    if (mEnableCacheDebugInfo)
+                    {
+                        LL_INFOS("LLDiskCache") << "Adding " << uuid_as_string << " to skip list" << LL_ENDL;
+                    }
+                    mSkipList.emplace_back(uuid_as_string);
+                }
+            }
+        }
+    }
+}
+// </FS:Beq>
+
 void LLDiskCache::clearCache()
 {
+    LL_INFOS() << "clearing cache " << mCacheDir << LL_ENDL;
     /**
      * See notes on performance in dirFileSize(..) - there may be
      * a quicker way to do this by operating on the parent dir vs
@@ -356,7 +433,10 @@ void LLDiskCache::clearCache()
                 }
             }
         }
+        // <FS:Beq> add static assets into the new cache after clear
+        prepopulateCacheWithStatic();
     }
+    LL_INFOS() << "Cleared cache " << mCacheDir << LL_ENDL;
 }
 
 uintmax_t LLDiskCache::dirFileSize(const std::string dir)

indra/llfilesystem/lldiskcache.h

@@ -131,6 +131,11 @@ class LLDiskCache :
          */
         void purge();
 
+        // <FS:Beq>
+        // copy from distribution into cache to replace static content
+        void prepopulateCacheWithStatic();
+        // </FS:Beq>
+
         /**
          * Clear the cache by removing all the files in the specified cache
          * directory individually. Only the files that contain a prefix defined
@@ -191,6 +196,8 @@ class LLDiskCache :
          * various parts of the code
          */
         bool mEnableCacheDebugInfo;
+        
+        std::vector<std::string> mSkipList;  // <FS:Beq/> Vector of "static" untouchable assets that should never be purged
 };
 
 // <FS:Ansariel> Regular disk cache cleanup

indra/newview/app_settings/static_assets/02862ac0-a61d-94c2-5d11-5f5d319b1256.clothing

@@ -0,0 +1,28 @@
+LLWearable version 22
+RASL SOCKS BROWN
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 7
+parameters 4
+617 1
+818 1
+819 1
+820 1
+textures 1
+12 301a3097-2858-7614-829d-c5859741246f

indra/newview/app_settings/static_assets/02c4eae7-b6a3-b4b0-44b0-b7b29d7f913f.clothing

@@ -0,0 +1,34 @@
+LLWearable version 22
+RASL F SHOP SHOES FOOTSHAPER
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	df110c10-72e6-40d6-8916-14b4b0366b18
+		owner_id	df110c10-72e6-40d6-8916-14b4b0366b18
+		last_owner_id	df110c10-72e6-40d6-8916-14b4b0366b18
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 6
+parameters 10
+198 1
+503 .17
+508 -1
+513 0
+514 .37
+616 .1
+654 .08
+812 1
+813 1
+817 1
+textures 1
+7 3ab7e2fa-9572-ef36-1a30-d855dbea4f92

indra/newview/app_settings/static_assets/07d61cde-bc5b-f95f-f747-2e57eab4ef12.clothing

@@ -0,0 +1,29 @@
+LLWearable version 22
+RASL F LEARN LEGGINGS
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 11
+parameters 5
+619 1
+624 1
+824 1
+825 1
+826 1
+textures 1
+17 6f5d29ce-548f-fdd0-b8e1-1f90a123b76e

indra/newview/app_settings/static_assets/0b29c4fd-9c3c-3047-fcb4-addd3e42a289.clothing

@@ -0,0 +1,34 @@
+LLWearable version 22
+RASL M EXPLORE TANK UP (WHITE)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 4
+parameters 10
+781 1
+800 1
+801 1
+802 1
+803 1
+804 1
+805 1
+828 0
+840 0
+868 0
+textures 1
+1 5ab7802c-a722-8cf0-66c6-6160efe4a130

indra/newview/app_settings/static_assets/0c5f60ae-1a54-1ee8-398d-7ed278552132.bodypart

@@ -0,0 +1,105 @@
+LLWearable version 22
+RASL M CREATE SHAPE (MIKO)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 0
+parameters 82
+1 .21
+2 -.21
+4 .26
+5 -.07
+6 .13
+7 -.04
+8 -.2
+10 .25
+11 .1
+12 .07
+13 .03
+14 .67
+15 -.2
+17 .14
+18 .5
+19 -.4
+20 -.04
+21 .26
+22 .02
+23 -.06
+24 -.1
+25 .53
+27 .43
+33 1.14
+34 -.02
+35 0
+36 -.9
+37 -.62
+38 .02
+80 1
+105 .5
+155 -.24
+157 .02
+185 -.6
+193 .65
+196 -1.07
+505 .61
+506 0
+507 0
+515 -1
+517 -.13
+518 -.19
+629 .43
+637 .03
+646 -.06
+647 .03
+649 .5
+650 .65
+652 .45
+653 .05
+656 0
+659 .62
+662 .5
+663 0
+664 0
+665 .08
+675 -.14
+676 -.4
+678 .41
+682 .59
+683 -.12
+684 0
+685 .19
+690 .41
+692 .36
+693 .2
+753 .65
+756 -.62
+758 -.54
+759 .45
+760 .11
+764 .44
+765 .29
+769 .47
+773 .43
+795 .23
+796 .21
+799 .52
+841 0
+842 -.24
+879 .08
+880 -.9
+textures 0

indra/newview/app_settings/static_assets/1232da7c-3d5b-a11b-cbee-d574aedc2e59.bodypart

@@ -0,0 +1,105 @@
+LLWearable version 22
+RASL M SHOP SHAPE (REMY)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 0
+parameters 82
+1 .21
+2 -.27
+4 .29
+5 .22
+6 -.07
+7 -.14
+8 -.2
+10 1.2
+11 .5
+12 .46
+13 .28
+14 .56
+15 -.22
+17 -.05
+18 1.02
+19 -.45
+20 -.2
+21 .23
+22 .55
+23 -.12
+24 -.24
+25 -.11
+27 .43
+33 .93
+34 -.26
+35 .17
+36 -.68
+37 -.14
+38 -.12
+80 1
+105 .5
+155 -.53
+157 .03
+185 -.68
+193 .6
+196 -.95
+505 .31
+506 -.28
+507 0
+515 -1
+517 -.17
+518 -.08
+629 .37
+637 .06
+646 -.06
+647 -.11
+649 .5
+650 -.55
+652 .43
+653 .5
+656 0
+659 .55
+662 .5
+663 0
+664 0
+665 0
+675 -.08
+676 -.1
+678 .41
+682 .58
+683 -.11
+684 0
+685 .08
+690 .44
+692 .08
+693 .2
+753 .9
+756 -.78
+758 -.42
+759 .17
+760 .3
+764 .54
+765 .32
+769 .46
+773 .45
+795 .3
+796 .28
+799 .53
+841 0
+842 -.1
+879 .1
+880 -.95
+textures 0

indra/newview/app_settings/static_assets/13b0d1c4-eb3c-9b89-2f13-9c0a714aab9f.clothing

@@ -0,0 +1,33 @@
+LLWearable version 22
+RASL M SHOP SWEATER DOWN
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 5
+parameters 9
+625 0
+638 0
+806 1
+807 1
+808 1
+814 1
+815 .99
+816 .05
+869 0
+textures 1
+2 106c9f6c-dc86-85ef-84b8-767fc0caf7c4

indra/newview/app_settings/static_assets/149739c0-f677-4b4c-1587-e44be72dd7ef.bodypart

@@ -0,0 +1,26 @@
+LLWearable version 22
+New Eyes
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	df110c10-72e6-40d6-8916-14b4b0366b18
+		owner_id	df110c10-72e6-40d6-8916-14b4b0366b18
+		last_owner_id	df110c10-72e6-40d6-8916-14b4b0366b18
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 3
+parameters 2
+98 1
+99 0
+textures 1
+3 07e1d75e-9312-ed2c-3c20-2d8a7e9109f0

indra/newview/app_settings/static_assets/16ef95d1-2fe3-d4a3-509d-f03bb2d327ca.clothing

@@ -0,0 +1,34 @@
+LLWearable version 22
+RASL M LOVE SHIRT UP (BLUE)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 4
+parameters 10
+781 1
+800 1
+801 1
+802 1
+803 1
+804 1
+805 1
+828 0
+840 0
+868 0
+textures 1
+1 9275f067-eff5-4a59-f98c-cd8a366e5426

indra/newview/app_settings/static_assets/17a387e1-28c7-e24b-4bfc-527b2d377a1b.clothing

@@ -0,0 +1,34 @@
+LLWearable version 22
+Male Designer Pants Shirt (Green)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	0008e000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 8
+parameters 9
+606 1
+607 1
+608 1
+609 1
+780 1
+834 1
+835 1
+836 1
+877 0
+textures 2
+13 7f2a3b5f-a5ef-d7a0-af6c-7f2cfc889fe1
+14 70ccbf04-adeb-d6b6-df7f-d9db89d53408

indra/newview/app_settings/static_assets/1b677754-5a07-641a-e989-34dcd985af1b.clothing

@@ -0,0 +1,29 @@
+LLWearable version 22
+RASL F LOVE DRESS DOWN
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 11
+parameters 5
+619 1
+624 1
+824 1
+825 1
+826 1
+textures 1
+17 36589cd6-c6e0-f17e-9be5-8f08d3708bd7

indra/newview/app_settings/static_assets/205ae4a8-42c6-1c5c-b142-672864fafe8a.bodypart

@@ -0,0 +1,52 @@
+LLWearable version 22
+RASL F EXPLORE SKIN (SOFIA)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	0008e000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		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 3
+0 f634e17f-3164-1dfe-508b-0e02547cebe4
+5 a6c6fd50-7d98-7afb-a7aa-348481f24c8a
+6 193bacad-5558-5e52-f3aa-3192a568e9a1

indra/newview/app_settings/static_assets/26a762c3-7164-0bbf-a7d6-ea097a6d0314.bodypart

@@ -0,0 +1,105 @@
+LLWearable version 22
+RASL F PLAY SHAPE (CLARA)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 0
+parameters 82
+1 .11
+2 -.31
+4 -.11
+5 -.08
+6 -.05
+7 .02
+8 -.42
+10 .84
+11 .24
+12 -.02
+13 0
+14 .61
+15 -.28
+17 .13
+18 .42
+19 -.35
+20 -.12
+21 .07
+22 .15
+23 -.34
+24 .11
+25 .1
+27 -.4
+33 .45
+34 0
+35 -.1
+36 -.94
+37 -.98
+38 -.18
+80 0
+105 .37
+155 -.46
+157 0
+185 -.72
+193 .56
+196 -.38
+505 .51
+506 -.68
+507 .04
+515 -1
+517 -.13
+518 .24
+629 .47
+637 .06
+646 -.15
+647 -.05
+649 .3
+650 -.8
+652 .35
+653 .23
+656 0
+659 .63
+662 .5
+663 0
+664 0
+665 .08
+675 -.19
+676 -.43
+678 .5
+682 .55
+683 -.17
+684 .18
+685 0
+690 .36
+692 .24
+693 .18
+753 .62
+756 -.42
+758 .06
+759 .17
+760 .85
+764 .28
+765 .2
+769 .2
+773 .51
+795 .24
+796 .11
+799 .55
+841 0
+842 .14
+879 0
+880 -.4
+textures 0

indra/newview/app_settings/static_assets/282d67ef-942e-27f4-9c7b-818f59967743.clothing

@@ -0,0 +1,33 @@
+LLWearable version 22
+RASL M LOVE SHIRT DOWN (BLUE)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 5
+parameters 9
+625 0
+638 0
+806 1
+807 1
+808 1
+814 1
+815 .99
+816 .05
+869 0
+textures 1
+2 1c8aa686-d913-3c2d-9c73-947cfae18da7

indra/newview/app_settings/static_assets/29a56cc8-3fcf-c575-02c7-14a303b12e17.clothing

@@ -0,0 +1,29 @@
+LLWearable version 22
+RASL F SHOP JEANS
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 11
+parameters 5
+619 1
+624 1
+824 1
+825 1
+826 1
+textures 1
+17 a77d7374-e4be-d4e3-9010-423a976d5da8

indra/newview/app_settings/static_assets/2b211c3e-d7c9-9e0e-0d96-e9357699bb25.clothing

@@ -0,0 +1,33 @@
+LLWearable version 22
+RASL F CREATE SHIRT DOWN (BLUE)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 5
+parameters 9
+625 0
+638 0
+806 1
+807 1
+808 1
+814 1
+815 .99
+816 .05
+869 0
+textures 1
+2 2f739543-d501-94a0-a039-0885a6d80034

indra/newview/app_settings/static_assets/2ca8ddae-23ef-0132-d243-7ae953582dd0.clothing

@@ -0,0 +1,34 @@
+LLWearable version 22
+RASL M LEARN TOP
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 8
+parameters 9
+606 1
+607 1
+608 1
+609 1
+780 1
+834 1
+835 1
+836 1
+877 0
+textures 2
+13 31ab25af-9af8-ef43-a952-d5619ca7169f
+14 fba230b7-219d-7129-f145-672d574bab34

indra/newview/app_settings/static_assets/2d408f13-f437-e00e-8f6d-b0857580b034.bodypart

@@ -0,0 +1,52 @@
+LLWearable version 22
+RASL M CREATE SKIN (BILLY)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 1
+parameters 26
+108 .04
+110 0
+111 .4
+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 3
+0 86c0cfbe-365f-0f74-5cd8-88e90a6e7f5c
+5 5ecc9bd1-9231-5a1a-61fd-3902e17f9da7
+6 43db1553-7a52-ffd9-814c-fae075a89732

indra/newview/app_settings/static_assets/30c1bdb4-1f99-3ee9-2a2e-098e4a3ceda6.clothing

@@ -0,0 +1,34 @@
+LLWearable version 22
+RASL M SHOP JACKET
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 8
+parameters 9
+606 1
+607 1
+608 1
+609 1
+780 1
+834 1
+835 1
+836 1
+877 0
+textures 2
+13 0f1edbd7-9e24-50f4-e43e-33c79a3fcdd3
+14 7d950588-19a5-3b45-b273-9e54a878333d

indra/newview/app_settings/static_assets/347df5d8-c73b-009d-f19d-df78aea8ec22.bodypart

@@ -0,0 +1,52 @@
+LLWearable version 22
+RASL M LOVE SKIN (Jon)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		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 .75
+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 3
+0 4ed0ebf9-f806-0af7-1ba8-3afba81c3e7c
+5 c3f2fcd9-416c-138a-9f45-326b062f9f1b
+6 9714d5e1-1c71-f92e-a695-71198839f5de

indra/newview/app_settings/static_assets/37ea8e97-1d16-b28d-8a48-7c88b39321cb.clothing

@@ -0,0 +1,34 @@
+LLWearable version 22
+RASL F PLAY BOLERO JACKET
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 8
+parameters 9
+606 1
+607 1
+608 1
+609 1
+780 1
+834 1
+835 1
+836 1
+877 0
+textures 2
+13 23f0e8f7-f852-c836-5f13-cfd643a8fb24
+14 85b13d86-3e95-8d4b-a03b-c9c737631194

indra/newview/app_settings/static_assets/3d6da7ba-e4a3-e08c-b52e-98a40cb4dc33.bodypart

@@ -0,0 +1,52 @@
+LLWearable version 22
+RASL F SHOP SKIN (Suzy)
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	79908808-d272-49a8-864a-d133a10931e9
+		owner_id	79908808-d272-49a8-864a-d133a10931e9
+		last_owner_id	79908808-d272-49a8-864a-d133a10931e9
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 1
+parameters 26
+108 .04
+110 0
+111 .4
+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 3
+0 ca158569-54b2-997e-e08a-84e1671f6203
+5 2f1251f3-3967-1044-4211-c6d311b57760
+6 178a21aa-85f2-8b57-9c7a-2d85ebc9f31e

indra/newview/app_settings/static_assets/3fc36cff-74b6-a980-3e4c-8f93a1dae205.clothing

@@ -0,0 +1,34 @@
+LLWearable version 22
+RASL ANNA BOOTS FOOTSHAPER
+
+	permissions 0
+	{
+		base_mask	7fffffff
+		owner_mask	7fffffff
+		group_mask	00000000
+		everyone_mask	00000000
+		next_owner_mask	00082000
+		creator_id	df110c10-72e6-40d6-8916-14b4b0366b18
+		owner_id	df110c10-72e6-40d6-8916-14b4b0366b18
+		last_owner_id	df110c10-72e6-40d6-8916-14b4b0366b18
+		group_id	00000000-0000-0000-0000-000000000000
+	}
+	sale_info	0
+	{
+		sale_type	not
+		sale_price	10
+	}
+type 6
+parameters 10
+198 1
+503 0
+508 -1
+513 0
+514 .21
+616 .1
+654 0
+812 1
+813 1
+817 1
+textures 1
+7 85b13d86-3e95-8d4b-a03b-c9c737631194