diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake index abef043fc7..f709f35403 100644 --- a/indra/cmake/bugsplat.cmake +++ b/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) diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp index 6e77de2735..aa4e07a583 100644 --- a/indra/llfilesystem/lldiskcache.cpp +++ b/indra/llfilesystem/lldiskcache.cpp @@ -62,6 +62,11 @@ LLDiskCache::LLDiskCache(const std::string cache_dir, LLFile::mkdir(dirname); } // + // 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(); + // } void LLDiskCache::purge() @@ -117,6 +122,11 @@ void LLDiskCache::purge() LL_INFOS() << "Purging cache to a maximum of " << mMaxSizeBytes << " bytes" << LL_ENDL; + // Extra accounting to track the retention of static assets + int keep{0}; + int del{0}; + int skip{0}; + // 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:"; - // 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()) + // 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=" < + // 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; + } } // } else { + keep++; // 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(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; // Extra accounting to track the retention of static assets } } @@ -321,8 +349,57 @@ const std::string LLDiskCache::getCacheInfo() return cache_info.str(); } +// 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 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); + } + } + } + } +} +// + 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() } } } + // 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) diff --git a/indra/llfilesystem/lldiskcache.h b/indra/llfilesystem/lldiskcache.h index 42a02a68e4..1164b428e0 100644 --- a/indra/llfilesystem/lldiskcache.h +++ b/indra/llfilesystem/lldiskcache.h @@ -131,6 +131,11 @@ class LLDiskCache : */ void purge(); + // + // copy from distribution into cache to replace static content + void prepopulateCacheWithStatic(); + // + /** * 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 mSkipList; // Vector of "static" untouchable assets that should never be purged }; // Regular disk cache cleanup diff --git a/indra/newview/app_settings/fs_static_assets/0b4ee516-5dfd-ef4b-4ab6-300bb44cb045.animatn b/indra/newview/app_settings/fs_static_assets/0b4ee516-5dfd-ef4b-4ab6-300bb44cb045.animatn new file mode 100644 index 0000000000..a44fbd473e Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/0b4ee516-5dfd-ef4b-4ab6-300bb44cb045.animatn differ diff --git a/indra/newview/app_settings/fs_static_assets/2029d88f-4efc-d72d-18d1-274caf9e9bc0.animatn b/indra/newview/app_settings/fs_static_assets/2029d88f-4efc-d72d-18d1-274caf9e9bc0.animatn new file mode 100644 index 0000000000..efc989bd9f Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/2029d88f-4efc-d72d-18d1-274caf9e9bc0.animatn differ diff --git a/indra/newview/app_settings/fs_static_assets/23f3163c-183b-dac0-0cdd-7811bcc3b5f1.animatn b/indra/newview/app_settings/fs_static_assets/23f3163c-183b-dac0-0cdd-7811bcc3b5f1.animatn new file mode 100644 index 0000000000..6f360d099f Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/23f3163c-183b-dac0-0cdd-7811bcc3b5f1.animatn differ diff --git a/indra/newview/app_settings/fs_static_assets/2cfeed25-04f9-caff-f3d2-776cddea5771.animatn b/indra/newview/app_settings/fs_static_assets/2cfeed25-04f9-caff-f3d2-776cddea5771.animatn new file mode 100644 index 0000000000..f52efc44b6 Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/2cfeed25-04f9-caff-f3d2-776cddea5771.animatn differ diff --git a/indra/newview/app_settings/fs_static_assets/3481ccd5-cc6c-65ca-c466-dc9df1bf3944.animatn b/indra/newview/app_settings/fs_static_assets/3481ccd5-cc6c-65ca-c466-dc9df1bf3944.animatn new file mode 100644 index 0000000000..386ce2bb64 Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/3481ccd5-cc6c-65ca-c466-dc9df1bf3944.animatn differ diff --git a/indra/newview/app_settings/fs_static_assets/6e83f685-2f53-278f-6758-b529327cce09.animatn b/indra/newview/app_settings/fs_static_assets/6e83f685-2f53-278f-6758-b529327cce09.animatn new file mode 100644 index 0000000000..48ff263e53 Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/6e83f685-2f53-278f-6758-b529327cce09.animatn differ diff --git a/indra/newview/app_settings/fs_static_assets/b23c52ef-0b15-11f2-852d-8fbd33417847.animatn b/indra/newview/app_settings/fs_static_assets/b23c52ef-0b15-11f2-852d-8fbd33417847.animatn new file mode 100644 index 0000000000..5c96c6822a Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/b23c52ef-0b15-11f2-852d-8fbd33417847.animatn differ diff --git a/indra/newview/app_settings/fs_static_assets/b2f312aa-2c1e-27b8-50fe-a0fa4ff3df4e.animatn b/indra/newview/app_settings/fs_static_assets/b2f312aa-2c1e-27b8-50fe-a0fa4ff3df4e.animatn new file mode 100644 index 0000000000..c0ff832512 Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/b2f312aa-2c1e-27b8-50fe-a0fa4ff3df4e.animatn differ diff --git a/indra/newview/app_settings/fs_static_assets/c17677b8-9fb2-8d6e-bbbe-219edce64ef4.animatn b/indra/newview/app_settings/fs_static_assets/c17677b8-9fb2-8d6e-bbbe-219edce64ef4.animatn new file mode 100644 index 0000000000..838a90ed86 Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/c17677b8-9fb2-8d6e-bbbe-219edce64ef4.animatn differ diff --git a/indra/newview/app_settings/fs_static_assets/cff5559e-c915-0b5e-d587-f789b5cc299a.animatn b/indra/newview/app_settings/fs_static_assets/cff5559e-c915-0b5e-d587-f789b5cc299a.animatn new file mode 100644 index 0000000000..e1a896372b Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/cff5559e-c915-0b5e-d587-f789b5cc299a.animatn differ diff --git a/indra/newview/app_settings/fs_static_assets/e14fee5f-3735-a236-2e26-94f92f366d81.animatn b/indra/newview/app_settings/fs_static_assets/e14fee5f-3735-a236-2e26-94f92f366d81.animatn new file mode 100644 index 0000000000..031007addb Binary files /dev/null and b/indra/newview/app_settings/fs_static_assets/e14fee5f-3735-a236-2e26-94f92f366d81.animatn differ diff --git a/indra/newview/app_settings/static_assets/00b48fa0-ac43-fadf-d061-6b726a24a90a.gesture b/indra/newview/app_settings/static_assets/00b48fa0-ac43-fadf-d061-6b726a24a90a.gesture new file mode 100644 index 0000000000..52188744f2 Binary files /dev/null and b/indra/newview/app_settings/static_assets/00b48fa0-ac43-fadf-d061-6b726a24a90a.gesture differ diff --git a/indra/newview/app_settings/static_assets/0247dbfa-f37e-64ab-d09f-2678884c7f4a.gesture b/indra/newview/app_settings/static_assets/0247dbfa-f37e-64ab-d09f-2678884c7f4a.gesture new file mode 100644 index 0000000000..38f8a9a86c Binary files /dev/null and b/indra/newview/app_settings/static_assets/0247dbfa-f37e-64ab-d09f-2678884c7f4a.gesture differ diff --git a/indra/newview/app_settings/static_assets/02862ac0-a61d-94c2-5d11-5f5d319b1256.clothing b/indra/newview/app_settings/static_assets/02862ac0-a61d-94c2-5d11-5f5d319b1256.clothing new file mode 100644 index 0000000000..d38b5a665a --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/02c4eae7-b6a3-b4b0-44b0-b7b29d7f913f.clothing b/indra/newview/app_settings/static_assets/02c4eae7-b6a3-b4b0-44b0-b7b29d7f913f.clothing new file mode 100644 index 0000000000..56dc179222 --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/032ac149-dacd-e88a-5397-b9996b58f278.gesture b/indra/newview/app_settings/static_assets/032ac149-dacd-e88a-5397-b9996b58f278.gesture new file mode 100644 index 0000000000..35a5eaf56d Binary files /dev/null and b/indra/newview/app_settings/static_assets/032ac149-dacd-e88a-5397-b9996b58f278.gesture differ diff --git a/indra/newview/app_settings/static_assets/038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53.animatn b/indra/newview/app_settings/static_assets/038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53.animatn new file mode 100644 index 0000000000..7e742caf27 Binary files /dev/null and b/indra/newview/app_settings/static_assets/038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53.animatn differ diff --git a/indra/newview/app_settings/static_assets/0401dc30-0fdd-1fc3-3e51-c683fe117184.gesture b/indra/newview/app_settings/static_assets/0401dc30-0fdd-1fc3-3e51-c683fe117184.gesture new file mode 100644 index 0000000000..743188b6a4 Binary files /dev/null and b/indra/newview/app_settings/static_assets/0401dc30-0fdd-1fc3-3e51-c683fe117184.gesture differ diff --git a/indra/newview/app_settings/static_assets/04608b19-1668-399c-5790-b7df8d9dc9cf.gesture b/indra/newview/app_settings/static_assets/04608b19-1668-399c-5790-b7df8d9dc9cf.gesture new file mode 100644 index 0000000000..8a5329d456 Binary files /dev/null and b/indra/newview/app_settings/static_assets/04608b19-1668-399c-5790-b7df8d9dc9cf.gesture differ diff --git a/indra/newview/app_settings/static_assets/05ddbff8-aaa9-92a1-2b74-8fe77a29b445.animatn b/indra/newview/app_settings/static_assets/05ddbff8-aaa9-92a1-2b74-8fe77a29b445.animatn new file mode 100644 index 0000000000..ef5d535656 Binary files /dev/null and b/indra/newview/app_settings/static_assets/05ddbff8-aaa9-92a1-2b74-8fe77a29b445.animatn differ diff --git a/indra/newview/app_settings/static_assets/07d61cde-bc5b-f95f-f747-2e57eab4ef12.clothing b/indra/newview/app_settings/static_assets/07d61cde-bc5b-f95f-f747-2e57eab4ef12.clothing new file mode 100644 index 0000000000..10c8ad516b --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/0813d01a-d3d3-32a4-48a3-26b6e1e01e39.gesture b/indra/newview/app_settings/static_assets/0813d01a-d3d3-32a4-48a3-26b6e1e01e39.gesture new file mode 100644 index 0000000000..8d0cfc8dc0 Binary files /dev/null and b/indra/newview/app_settings/static_assets/0813d01a-d3d3-32a4-48a3-26b6e1e01e39.gesture differ diff --git a/indra/newview/app_settings/static_assets/0836b67f-7f7b-f37b-c00a-460dc1521f5a.animatn b/indra/newview/app_settings/static_assets/0836b67f-7f7b-f37b-c00a-460dc1521f5a.animatn new file mode 100644 index 0000000000..eaa64a58c5 Binary files /dev/null and b/indra/newview/app_settings/static_assets/0836b67f-7f7b-f37b-c00a-460dc1521f5a.animatn differ diff --git a/indra/newview/app_settings/static_assets/08464f78-3a8e-2944-cba5-0c94aff3af29.animatn b/indra/newview/app_settings/static_assets/08464f78-3a8e-2944-cba5-0c94aff3af29.animatn new file mode 100644 index 0000000000..fdf5fc53a0 Binary files /dev/null and b/indra/newview/app_settings/static_assets/08464f78-3a8e-2944-cba5-0c94aff3af29.animatn differ diff --git a/indra/newview/app_settings/static_assets/0a3336cf-3ad1-012a-91c2-5b5620aaaef3.gesture b/indra/newview/app_settings/static_assets/0a3336cf-3ad1-012a-91c2-5b5620aaaef3.gesture new file mode 100644 index 0000000000..b7e1dfba90 Binary files /dev/null and b/indra/newview/app_settings/static_assets/0a3336cf-3ad1-012a-91c2-5b5620aaaef3.gesture differ diff --git a/indra/newview/app_settings/static_assets/0a9fb970-8b44-9114-d3a9-bf69cfe804d6.animatn b/indra/newview/app_settings/static_assets/0a9fb970-8b44-9114-d3a9-bf69cfe804d6.animatn new file mode 100644 index 0000000000..cf8bcf42ef Binary files /dev/null and b/indra/newview/app_settings/static_assets/0a9fb970-8b44-9114-d3a9-bf69cfe804d6.animatn differ diff --git a/indra/newview/app_settings/static_assets/0b29c4fd-9c3c-3047-fcb4-addd3e42a289.clothing b/indra/newview/app_settings/static_assets/0b29c4fd-9c3c-3047-fcb4-addd3e42a289.clothing new file mode 100644 index 0000000000..b89fabd12d --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/0c5f60ae-1a54-1ee8-398d-7ed278552132.bodypart b/indra/newview/app_settings/static_assets/0c5f60ae-1a54-1ee8-398d-7ed278552132.bodypart new file mode 100644 index 0000000000..58e0881824 --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/0ce71257-7a07-257f-f023-fd68575a3a4e.gesture b/indra/newview/app_settings/static_assets/0ce71257-7a07-257f-f023-fd68575a3a4e.gesture new file mode 100644 index 0000000000..8712d24674 Binary files /dev/null and b/indra/newview/app_settings/static_assets/0ce71257-7a07-257f-f023-fd68575a3a4e.gesture differ diff --git a/indra/newview/app_settings/static_assets/0eb702e2-cc5a-9a88-56a5-661a55c0676a.animatn b/indra/newview/app_settings/static_assets/0eb702e2-cc5a-9a88-56a5-661a55c0676a.animatn new file mode 100644 index 0000000000..96f40f1a87 Binary files /dev/null and b/indra/newview/app_settings/static_assets/0eb702e2-cc5a-9a88-56a5-661a55c0676a.animatn differ diff --git a/indra/newview/app_settings/static_assets/0eeb5ef7-10dd-4e4a-11a5-d053011fcdf2.gesture b/indra/newview/app_settings/static_assets/0eeb5ef7-10dd-4e4a-11a5-d053011fcdf2.gesture new file mode 100644 index 0000000000..514c7c3aba Binary files /dev/null and b/indra/newview/app_settings/static_assets/0eeb5ef7-10dd-4e4a-11a5-d053011fcdf2.gesture differ diff --git a/indra/newview/app_settings/static_assets/0f86e355-dd31-a61c-fdb0-3a96b9aad05f.animatn b/indra/newview/app_settings/static_assets/0f86e355-dd31-a61c-fdb0-3a96b9aad05f.animatn new file mode 100644 index 0000000000..05961c1872 Binary files /dev/null and b/indra/newview/app_settings/static_assets/0f86e355-dd31-a61c-fdb0-3a96b9aad05f.animatn differ diff --git a/indra/newview/app_settings/static_assets/11000694-3f41-adc2-606b-eee1d66f3724.animatn b/indra/newview/app_settings/static_assets/11000694-3f41-adc2-606b-eee1d66f3724.animatn new file mode 100644 index 0000000000..9489d963f9 Binary files /dev/null and b/indra/newview/app_settings/static_assets/11000694-3f41-adc2-606b-eee1d66f3724.animatn differ diff --git a/indra/newview/app_settings/static_assets/1232da7c-3d5b-a11b-cbee-d574aedc2e59.bodypart b/indra/newview/app_settings/static_assets/1232da7c-3d5b-a11b-cbee-d574aedc2e59.bodypart new file mode 100644 index 0000000000..2077eb4494 --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/13b0d1c4-eb3c-9b89-2f13-9c0a714aab9f.clothing b/indra/newview/app_settings/static_assets/13b0d1c4-eb3c-9b89-2f13-9c0a714aab9f.clothing new file mode 100644 index 0000000000..8edf121335 --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/149739c0-f677-4b4c-1587-e44be72dd7ef.bodypart b/indra/newview/app_settings/static_assets/149739c0-f677-4b4c-1587-e44be72dd7ef.bodypart new file mode 100644 index 0000000000..07db7550df --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/15468e00-3400-bb66-cecc-646d7c14458e.animatn b/indra/newview/app_settings/static_assets/15468e00-3400-bb66-cecc-646d7c14458e.animatn new file mode 100644 index 0000000000..232b2b86f0 Binary files /dev/null and b/indra/newview/app_settings/static_assets/15468e00-3400-bb66-cecc-646d7c14458e.animatn differ diff --git a/indra/newview/app_settings/static_assets/159afee8-b7bf-c8fb-9c63-98276a1d6b28.gesture b/indra/newview/app_settings/static_assets/159afee8-b7bf-c8fb-9c63-98276a1d6b28.gesture new file mode 100644 index 0000000000..347aa6ad65 Binary files /dev/null and b/indra/newview/app_settings/static_assets/159afee8-b7bf-c8fb-9c63-98276a1d6b28.gesture differ diff --git a/indra/newview/app_settings/static_assets/15dd911d-be82-2856-26db-27659b142875.animatn b/indra/newview/app_settings/static_assets/15dd911d-be82-2856-26db-27659b142875.animatn new file mode 100644 index 0000000000..6a71abbbdd Binary files /dev/null and b/indra/newview/app_settings/static_assets/15dd911d-be82-2856-26db-27659b142875.animatn differ diff --git a/indra/newview/app_settings/static_assets/16803a9f-5140-e042-4d7b-d28ba247c325.animatn b/indra/newview/app_settings/static_assets/16803a9f-5140-e042-4d7b-d28ba247c325.animatn new file mode 100644 index 0000000000..4da6d2828f Binary files /dev/null and b/indra/newview/app_settings/static_assets/16803a9f-5140-e042-4d7b-d28ba247c325.animatn differ diff --git a/indra/newview/app_settings/static_assets/16ef95d1-2fe3-d4a3-509d-f03bb2d327ca.clothing b/indra/newview/app_settings/static_assets/16ef95d1-2fe3-d4a3-509d-f03bb2d327ca.clothing new file mode 100644 index 0000000000..426d21e6b2 --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/17a387e1-28c7-e24b-4bfc-527b2d377a1b.clothing b/indra/newview/app_settings/static_assets/17a387e1-28c7-e24b-4bfc-527b2d377a1b.clothing new file mode 100644 index 0000000000..121aea9ab7 --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/17c024cc-eef2-f6a0-3527-9869876d7752.animatn b/indra/newview/app_settings/static_assets/17c024cc-eef2-f6a0-3527-9869876d7752.animatn new file mode 100644 index 0000000000..a7a4e132e3 Binary files /dev/null and b/indra/newview/app_settings/static_assets/17c024cc-eef2-f6a0-3527-9869876d7752.animatn differ diff --git a/indra/newview/app_settings/static_assets/18b3a4b5-b463-bd48-e4b6-71eaac76c515.animatn b/indra/newview/app_settings/static_assets/18b3a4b5-b463-bd48-e4b6-71eaac76c515.animatn new file mode 100644 index 0000000000..c0382423eb Binary files /dev/null and b/indra/newview/app_settings/static_assets/18b3a4b5-b463-bd48-e4b6-71eaac76c515.animatn differ diff --git a/indra/newview/app_settings/static_assets/1910ffbd-096c-5eb7-19f5-8c99ab6a748c.gesture b/indra/newview/app_settings/static_assets/1910ffbd-096c-5eb7-19f5-8c99ab6a748c.gesture new file mode 100644 index 0000000000..eb6117afb8 Binary files /dev/null and b/indra/newview/app_settings/static_assets/1910ffbd-096c-5eb7-19f5-8c99ab6a748c.gesture differ diff --git a/indra/newview/app_settings/static_assets/19999406-3a3a-d58c-a2ac-d72e555dcf51.animatn b/indra/newview/app_settings/static_assets/19999406-3a3a-d58c-a2ac-d72e555dcf51.animatn new file mode 100644 index 0000000000..1f176d7fda Binary files /dev/null and b/indra/newview/app_settings/static_assets/19999406-3a3a-d58c-a2ac-d72e555dcf51.animatn differ diff --git a/indra/newview/app_settings/static_assets/1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e.animatn b/indra/newview/app_settings/static_assets/1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e.animatn new file mode 100644 index 0000000000..78fa39729a Binary files /dev/null and b/indra/newview/app_settings/static_assets/1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e.animatn differ diff --git a/indra/newview/app_settings/static_assets/1a5fe8ac-a804-8a5d-7cbd-56bd83184568.animatn b/indra/newview/app_settings/static_assets/1a5fe8ac-a804-8a5d-7cbd-56bd83184568.animatn new file mode 100644 index 0000000000..3312789020 Binary files /dev/null and b/indra/newview/app_settings/static_assets/1a5fe8ac-a804-8a5d-7cbd-56bd83184568.animatn differ diff --git a/indra/newview/app_settings/static_assets/1ab1b236-cd08-21e6-0cbc-0d923fc6eca2.animatn b/indra/newview/app_settings/static_assets/1ab1b236-cd08-21e6-0cbc-0d923fc6eca2.animatn new file mode 100644 index 0000000000..9eb2468ef0 Binary files /dev/null and b/indra/newview/app_settings/static_assets/1ab1b236-cd08-21e6-0cbc-0d923fc6eca2.animatn differ diff --git a/indra/newview/app_settings/static_assets/1ac2c678-3ab4-410b-2aad-30a7dc9c4504.gesture b/indra/newview/app_settings/static_assets/1ac2c678-3ab4-410b-2aad-30a7dc9c4504.gesture new file mode 100644 index 0000000000..4db5269027 Binary files /dev/null and b/indra/newview/app_settings/static_assets/1ac2c678-3ab4-410b-2aad-30a7dc9c4504.gesture differ diff --git a/indra/newview/app_settings/static_assets/1b677754-5a07-641a-e989-34dcd985af1b.clothing b/indra/newview/app_settings/static_assets/1b677754-5a07-641a-e989-34dcd985af1b.clothing new file mode 100644 index 0000000000..0cfef0032c --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/1c7600d6-661f-b87b-efe2-d7421eb93c86.animatn b/indra/newview/app_settings/static_assets/1c7600d6-661f-b87b-efe2-d7421eb93c86.animatn new file mode 100644 index 0000000000..06a14fca82 Binary files /dev/null and b/indra/newview/app_settings/static_assets/1c7600d6-661f-b87b-efe2-d7421eb93c86.animatn differ diff --git a/indra/newview/app_settings/static_assets/1cb562b0-ba21-2202-efb3-30f82cdf9595.animatn b/indra/newview/app_settings/static_assets/1cb562b0-ba21-2202-efb3-30f82cdf9595.animatn new file mode 100644 index 0000000000..89e70a8c29 Binary files /dev/null and b/indra/newview/app_settings/static_assets/1cb562b0-ba21-2202-efb3-30f82cdf9595.animatn differ diff --git a/indra/newview/app_settings/static_assets/1f5466aa-2b68-e370-6bb5-a335e859afeb.gesture b/indra/newview/app_settings/static_assets/1f5466aa-2b68-e370-6bb5-a335e859afeb.gesture new file mode 100644 index 0000000000..3b167eb949 Binary files /dev/null and b/indra/newview/app_settings/static_assets/1f5466aa-2b68-e370-6bb5-a335e859afeb.gesture differ diff --git a/indra/newview/app_settings/static_assets/201f3fdf-cb1f-dbec-201f-7333e328ae7c.animatn b/indra/newview/app_settings/static_assets/201f3fdf-cb1f-dbec-201f-7333e328ae7c.animatn new file mode 100644 index 0000000000..d2dfc12cd4 Binary files /dev/null and b/indra/newview/app_settings/static_assets/201f3fdf-cb1f-dbec-201f-7333e328ae7c.animatn differ diff --git a/indra/newview/app_settings/static_assets/205ae4a8-42c6-1c5c-b142-672864fafe8a.bodypart b/indra/newview/app_settings/static_assets/205ae4a8-42c6-1c5c-b142-672864fafe8a.bodypart new file mode 100644 index 0000000000..843e7c53a9 --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/20f063ea-8306-2562-0b07-5c853b37b31e.animatn b/indra/newview/app_settings/static_assets/20f063ea-8306-2562-0b07-5c853b37b31e.animatn new file mode 100644 index 0000000000..b14549416e Binary files /dev/null and b/indra/newview/app_settings/static_assets/20f063ea-8306-2562-0b07-5c853b37b31e.animatn differ diff --git a/indra/newview/app_settings/static_assets/2305bd75-1ca9-b03b-1faa-b176b8a8c49e.animatn b/indra/newview/app_settings/static_assets/2305bd75-1ca9-b03b-1faa-b176b8a8c49e.animatn new file mode 100644 index 0000000000..73a5768e2b Binary files /dev/null and b/indra/newview/app_settings/static_assets/2305bd75-1ca9-b03b-1faa-b176b8a8c49e.animatn differ diff --git a/indra/newview/app_settings/static_assets/230ff836-fe1e-ab33-80c6-ef029c658136.gesture b/indra/newview/app_settings/static_assets/230ff836-fe1e-ab33-80c6-ef029c658136.gesture new file mode 100644 index 0000000000..078d16ee86 Binary files /dev/null and b/indra/newview/app_settings/static_assets/230ff836-fe1e-ab33-80c6-ef029c658136.gesture differ diff --git a/indra/newview/app_settings/static_assets/2408fe9e-df1d-1d7d-f4ff-1384fa7b350f.animatn b/indra/newview/app_settings/static_assets/2408fe9e-df1d-1d7d-f4ff-1384fa7b350f.animatn new file mode 100644 index 0000000000..e47287c802 Binary files /dev/null and b/indra/newview/app_settings/static_assets/2408fe9e-df1d-1d7d-f4ff-1384fa7b350f.animatn differ diff --git a/indra/newview/app_settings/static_assets/245f3c54-f1c0-bf2e-811f-46d8eeb386e7.animatn b/indra/newview/app_settings/static_assets/245f3c54-f1c0-bf2e-811f-46d8eeb386e7.animatn new file mode 100644 index 0000000000..019bce405f Binary files /dev/null and b/indra/newview/app_settings/static_assets/245f3c54-f1c0-bf2e-811f-46d8eeb386e7.animatn differ diff --git a/indra/newview/app_settings/static_assets/25252e5b-394b-fdab-76ee-28980cd62f81.gesture b/indra/newview/app_settings/static_assets/25252e5b-394b-fdab-76ee-28980cd62f81.gesture new file mode 100644 index 0000000000..cdb18147df Binary files /dev/null and b/indra/newview/app_settings/static_assets/25252e5b-394b-fdab-76ee-28980cd62f81.gesture differ diff --git a/indra/newview/app_settings/static_assets/252acecb-a169-eff2-4601-b06bbeb91e84.gesture b/indra/newview/app_settings/static_assets/252acecb-a169-eff2-4601-b06bbeb91e84.gesture new file mode 100644 index 0000000000..d4406daf79 Binary files /dev/null and b/indra/newview/app_settings/static_assets/252acecb-a169-eff2-4601-b06bbeb91e84.gesture differ diff --git a/indra/newview/app_settings/static_assets/26a762c3-7164-0bbf-a7d6-ea097a6d0314.bodypart b/indra/newview/app_settings/static_assets/26a762c3-7164-0bbf-a7d6-ea097a6d0314.bodypart new file mode 100644 index 0000000000..5485883f01 --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/26cc2407-84b5-6887-4564-85a9b0cfb01f.gesture b/indra/newview/app_settings/static_assets/26cc2407-84b5-6887-4564-85a9b0cfb01f.gesture new file mode 100644 index 0000000000..123d418499 Binary files /dev/null and b/indra/newview/app_settings/static_assets/26cc2407-84b5-6887-4564-85a9b0cfb01f.gesture differ diff --git a/indra/newview/app_settings/static_assets/282d67ef-942e-27f4-9c7b-818f59967743.clothing b/indra/newview/app_settings/static_assets/282d67ef-942e-27f4-9c7b-818f59967743.clothing new file mode 100644 index 0000000000..444ee2853d --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/29a56cc8-3fcf-c575-02c7-14a303b12e17.clothing b/indra/newview/app_settings/static_assets/29a56cc8-3fcf-c575-02c7-14a303b12e17.clothing new file mode 100644 index 0000000000..f44730c489 --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/29f11d26-7d80-4b53-a97c-fce85d94e392.gesture b/indra/newview/app_settings/static_assets/29f11d26-7d80-4b53-a97c-fce85d94e392.gesture new file mode 100644 index 0000000000..6bd154bc4a Binary files /dev/null and b/indra/newview/app_settings/static_assets/29f11d26-7d80-4b53-a97c-fce85d94e392.gesture differ diff --git a/indra/newview/app_settings/static_assets/2b211c3e-d7c9-9e0e-0d96-e9357699bb25.clothing b/indra/newview/app_settings/static_assets/2b211c3e-d7c9-9e0e-0d96-e9357699bb25.clothing new file mode 100644 index 0000000000..5d8ec3acaa --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/2b5a38b2-5e00-3a97-a495-4c826bc443e6.animatn b/indra/newview/app_settings/static_assets/2b5a38b2-5e00-3a97-a495-4c826bc443e6.animatn new file mode 100644 index 0000000000..b7f50ade77 Binary files /dev/null and b/indra/newview/app_settings/static_assets/2b5a38b2-5e00-3a97-a495-4c826bc443e6.animatn differ diff --git a/indra/newview/app_settings/static_assets/2ca8ddae-23ef-0132-d243-7ae953582dd0.clothing b/indra/newview/app_settings/static_assets/2ca8ddae-23ef-0132-d243-7ae953582dd0.clothing new file mode 100644 index 0000000000..09ac14893b --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/2d03fd78-92fc-ca52-aabb-a4904e1339d1.gesture b/indra/newview/app_settings/static_assets/2d03fd78-92fc-ca52-aabb-a4904e1339d1.gesture new file mode 100644 index 0000000000..289c19cb21 Binary files /dev/null and b/indra/newview/app_settings/static_assets/2d03fd78-92fc-ca52-aabb-a4904e1339d1.gesture differ diff --git a/indra/newview/app_settings/static_assets/2d408f13-f437-e00e-8f6d-b0857580b034.bodypart b/indra/newview/app_settings/static_assets/2d408f13-f437-e00e-8f6d-b0857580b034.bodypart new file mode 100644 index 0000000000..c53a9f514f --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/2d6daa51-3192-6794-8e2e-a15f8338ec30.animatn b/indra/newview/app_settings/static_assets/2d6daa51-3192-6794-8e2e-a15f8338ec30.animatn new file mode 100644 index 0000000000..7aad799749 Binary files /dev/null and b/indra/newview/app_settings/static_assets/2d6daa51-3192-6794-8e2e-a15f8338ec30.animatn differ diff --git a/indra/newview/app_settings/static_assets/30047778-10ea-1af7-6881-4db7a3a5a114.animatn b/indra/newview/app_settings/static_assets/30047778-10ea-1af7-6881-4db7a3a5a114.animatn new file mode 100644 index 0000000000..b6bb0df598 Binary files /dev/null and b/indra/newview/app_settings/static_assets/30047778-10ea-1af7-6881-4db7a3a5a114.animatn differ diff --git a/indra/newview/app_settings/static_assets/30c1bdb4-1f99-3ee9-2a2e-098e4a3ceda6.clothing b/indra/newview/app_settings/static_assets/30c1bdb4-1f99-3ee9-2a2e-098e4a3ceda6.clothing new file mode 100644 index 0000000000..9d65799aaf --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/313b9881-4302-73c0-c7d0-0e7a36b6c224.animatn b/indra/newview/app_settings/static_assets/313b9881-4302-73c0-c7d0-0e7a36b6c224.animatn new file mode 100644 index 0000000000..1f9f8391a2 Binary files /dev/null and b/indra/newview/app_settings/static_assets/313b9881-4302-73c0-c7d0-0e7a36b6c224.animatn differ diff --git a/indra/newview/app_settings/static_assets/3147d815-6338-b932-f011-16b56d9ac18b.animatn b/indra/newview/app_settings/static_assets/3147d815-6338-b932-f011-16b56d9ac18b.animatn new file mode 100644 index 0000000000..7fe3d2ddd6 Binary files /dev/null and b/indra/newview/app_settings/static_assets/3147d815-6338-b932-f011-16b56d9ac18b.animatn differ diff --git a/indra/newview/app_settings/static_assets/315c3a41-a5f3-0ba4-27da-f893f769e69b.animatn b/indra/newview/app_settings/static_assets/315c3a41-a5f3-0ba4-27da-f893f769e69b.animatn new file mode 100644 index 0000000000..52a60b3eba Binary files /dev/null and b/indra/newview/app_settings/static_assets/315c3a41-a5f3-0ba4-27da-f893f769e69b.animatn differ diff --git a/indra/newview/app_settings/static_assets/33339176-7ddc-9397-94a4-bf3403cbc8f5.animatn b/indra/newview/app_settings/static_assets/33339176-7ddc-9397-94a4-bf3403cbc8f5.animatn new file mode 100644 index 0000000000..fb1834eb5f Binary files /dev/null and b/indra/newview/app_settings/static_assets/33339176-7ddc-9397-94a4-bf3403cbc8f5.animatn differ diff --git a/indra/newview/app_settings/static_assets/347df5d8-c73b-009d-f19d-df78aea8ec22.bodypart b/indra/newview/app_settings/static_assets/347df5d8-c73b-009d-f19d-df78aea8ec22.bodypart new file mode 100644 index 0000000000..04e6fdc4cf --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/349a3801-54f9-bf2c-3bd0-1ac89772af01.animatn b/indra/newview/app_settings/static_assets/349a3801-54f9-bf2c-3bd0-1ac89772af01.animatn new file mode 100644 index 0000000000..41ef5cdeaa Binary files /dev/null and b/indra/newview/app_settings/static_assets/349a3801-54f9-bf2c-3bd0-1ac89772af01.animatn differ diff --git a/indra/newview/app_settings/static_assets/35db4f7e-28c2-6679-cea9-3ee108f7fc7f.animatn b/indra/newview/app_settings/static_assets/35db4f7e-28c2-6679-cea9-3ee108f7fc7f.animatn new file mode 100644 index 0000000000..1de30618c1 Binary files /dev/null and b/indra/newview/app_settings/static_assets/35db4f7e-28c2-6679-cea9-3ee108f7fc7f.animatn differ diff --git a/indra/newview/app_settings/static_assets/36f81a92-f076-5893-dc4b-7c3795e487cf.animatn b/indra/newview/app_settings/static_assets/36f81a92-f076-5893-dc4b-7c3795e487cf.animatn new file mode 100644 index 0000000000..eb319331e1 Binary files /dev/null and b/indra/newview/app_settings/static_assets/36f81a92-f076-5893-dc4b-7c3795e487cf.animatn differ diff --git a/indra/newview/app_settings/static_assets/370f3a20-6ca6-9971-848c-9a01bc42ae3c.animatn b/indra/newview/app_settings/static_assets/370f3a20-6ca6-9971-848c-9a01bc42ae3c.animatn new file mode 100644 index 0000000000..728d33b714 Binary files /dev/null and b/indra/newview/app_settings/static_assets/370f3a20-6ca6-9971-848c-9a01bc42ae3c.animatn differ diff --git a/indra/newview/app_settings/static_assets/37ea8e97-1d16-b28d-8a48-7c88b39321cb.clothing b/indra/newview/app_settings/static_assets/37ea8e97-1d16-b28d-8a48-7c88b39321cb.clothing new file mode 100644 index 0000000000..2bfaf1e3c0 --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/3d6da7ba-e4a3-e08c-b52e-98a40cb4dc33.bodypart b/indra/newview/app_settings/static_assets/3d6da7ba-e4a3-e08c-b52e-98a40cb4dc33.bodypart new file mode 100644 index 0000000000..187f7f050f --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/3d8a32a0-3c25-ddcc-f807-e50f796e1dde.gesture b/indra/newview/app_settings/static_assets/3d8a32a0-3c25-ddcc-f807-e50f796e1dde.gesture new file mode 100644 index 0000000000..b31632c9e9 Binary files /dev/null and b/indra/newview/app_settings/static_assets/3d8a32a0-3c25-ddcc-f807-e50f796e1dde.gesture differ diff --git a/indra/newview/app_settings/static_assets/3d94bad0-c55b-7dcc-8763-033c59405d33.animatn b/indra/newview/app_settings/static_assets/3d94bad0-c55b-7dcc-8763-033c59405d33.animatn new file mode 100644 index 0000000000..ed5bdfdf5e Binary files /dev/null and b/indra/newview/app_settings/static_assets/3d94bad0-c55b-7dcc-8763-033c59405d33.animatn differ diff --git a/indra/newview/app_settings/static_assets/3da1d753-028a-5446-24f3-9c9b856d9422.animatn b/indra/newview/app_settings/static_assets/3da1d753-028a-5446-24f3-9c9b856d9422.animatn new file mode 100644 index 0000000000..7f52de0585 Binary files /dev/null and b/indra/newview/app_settings/static_assets/3da1d753-028a-5446-24f3-9c9b856d9422.animatn differ diff --git a/indra/newview/app_settings/static_assets/3f1cf9b6-f52c-46cd-bcf7-ffb7c8c25aea.gesture b/indra/newview/app_settings/static_assets/3f1cf9b6-f52c-46cd-bcf7-ffb7c8c25aea.gesture new file mode 100644 index 0000000000..ad795ceb80 Binary files /dev/null and b/indra/newview/app_settings/static_assets/3f1cf9b6-f52c-46cd-bcf7-ffb7c8c25aea.gesture differ diff --git a/indra/newview/app_settings/static_assets/3f258e00-f5ac-68b2-bfb0-0c3c0fa3e614.gesture b/indra/newview/app_settings/static_assets/3f258e00-f5ac-68b2-bfb0-0c3c0fa3e614.gesture new file mode 100644 index 0000000000..0e02ee3a27 Binary files /dev/null and b/indra/newview/app_settings/static_assets/3f258e00-f5ac-68b2-bfb0-0c3c0fa3e614.gesture differ diff --git a/indra/newview/app_settings/static_assets/3fc36cff-74b6-a980-3e4c-8f93a1dae205.clothing b/indra/newview/app_settings/static_assets/3fc36cff-74b6-a980-3e4c-8f93a1dae205.clothing new file mode 100644 index 0000000000..fa5dae9bca --- /dev/null +++ b/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 diff --git a/indra/newview/app_settings/static_assets/40b92916-8055-2562-008f-58924bd0e03c.gesture b/indra/newview/app_settings/static_assets/40b92916-8055-2562-008f-58924bd0e03c.gesture new file mode 100644 index 0000000000..63b18c8c50 Binary files /dev/null and b/indra/newview/app_settings/static_assets/40b92916-8055-2562-008f-58924bd0e03c.gesture differ diff --git a/indra/newview/app_settings/static_assets/41426836-7437-7e89-025d-0aa4d10f1d69.animatn b/indra/newview/app_settings/static_assets/41426836-7437-7e89-025d-0aa4d10f1d69.animatn new file mode 100644 index 0000000000..aead27694e Binary files /dev/null and b/indra/newview/app_settings/static_assets/41426836-7437-7e89-025d-0aa4d10f1d69.animatn differ diff --git a/indra/newview/app_settings/static_assets/42b46214-4b44-79ae-deb8-0df61424ff4b.animatn b/indra/newview/app_settings/static_assets/42b46214-4b44-79ae-deb8-0df61424ff4b.animatn new file mode 100644 index 0000000000..90e909d8ed Binary files /dev/null and b/indra/newview/app_settings/static_assets/42b46214-4b44-79ae-deb8-0df61424ff4b.animatn differ diff --git a/indra/newview/app_settings/static_assets/42dd95d5-0bc6-6392-f650-777304946c0f.animatn b/indra/newview/app_settings/static_assets/42dd95d5-0bc6-6392-f650-777304946c0f.animatn new file mode 100644 index 0000000000..81d00858f5 Binary files /dev/null and b/indra/newview/app_settings/static_assets/42dd95d5-0bc6-6392-f650-777304946c0f.animatn differ diff --git a/indra/newview/app_settings/static_assets/42ecd00b-9947-a97c-400a-bbc9174c7aeb.animatn b/indra/newview/app_settings/static_assets/42ecd00b-9947-a97c-400a-bbc9174c7aeb.animatn new file mode 100644 index 0000000000..39d3f0b41c Binary files /dev/null and b/indra/newview/app_settings/static_assets/42ecd00b-9947-a97c-400a-bbc9174c7aeb.animatn differ diff --git a/indra/newview/app_settings/static_assets/43417d10-a2f7-7727-6fd4-dd7f04ad7a13.gesture b/indra/newview/app_settings/static_assets/43417d10-a2f7-7727-6fd4-dd7f04ad7a13.gesture new file mode 100644 index 0000000000..8364c7e5ee Binary files /dev/null and b/indra/newview/app_settings/static_assets/43417d10-a2f7-7727-6fd4-dd7f04ad7a13.gesture differ diff --git a/indra/newview/app_settings/static_assets/44a87e64-2d78-14b7-1cde-ac0f5031621f.gesture b/indra/newview/app_settings/static_assets/44a87e64-2d78-14b7-1cde-ac0f5031621f.gesture new file mode 100644 index 0000000000..06a9afa456 Binary files /dev/null and b/indra/newview/app_settings/static_assets/44a87e64-2d78-14b7-1cde-ac0f5031621f.gesture differ diff --git a/indra/newview/app_settings/static_assets/46bb4359-de38-4ed8-6a22-f1f52fe8f506.animatn b/indra/newview/app_settings/static_assets/46bb4359-de38-4ed8-6a22-f1f52fe8f506.animatn new file mode 100644 index 0000000000..a85f1ea884 Binary files /dev/null and b/indra/newview/app_settings/static_assets/46bb4359-de38-4ed8-6a22-f1f52fe8f506.animatn differ diff --git a/indra/newview/app_settings/static_assets/47f5f6fb-22e5-ae44-f871-73aaaf4a6022.animatn b/indra/newview/app_settings/static_assets/47f5f6fb-22e5-ae44-f871-73aaaf4a6022.animatn new file mode 100644 index 0000000000..4348735620 Binary files /dev/null and b/indra/newview/app_settings/static_assets/47f5f6fb-22e5-ae44-f871-73aaaf4a6022.animatn differ diff --git a/indra/newview/app_settings/static_assets/49aea43b-5ac3-8a44-b595-96100af0beda.animatn b/indra/newview/app_settings/static_assets/49aea43b-5ac3-8a44-b595-96100af0beda.animatn new file mode 100644 index 0000000000..9d378ae472 Binary files /dev/null and b/indra/newview/app_settings/static_assets/49aea43b-5ac3-8a44-b595-96100af0beda.animatn differ diff --git a/indra/newview/app_settings/static_assets/4ae8016b-31b9-03bb-c401-b1ea941db41d.animatn b/indra/newview/app_settings/static_assets/4ae8016b-31b9-03bb-c401-b1ea941db41d.animatn new file mode 100644 index 0000000000..a2fcc32cfd Binary files /dev/null and b/indra/newview/app_settings/static_assets/4ae8016b-31b9-03bb-c401-b1ea941db41d.animatn differ diff --git a/indra/newview/app_settings/static_assets/4bd69a1d-1114-a0b4-625f-84e0a5237155.animatn b/indra/newview/app_settings/static_assets/4bd69a1d-1114-a0b4-625f-84e0a5237155.animatn new file mode 100644 index 0000000000..2eedbda6b7 Binary files /dev/null and b/indra/newview/app_settings/static_assets/4bd69a1d-1114-a0b4-625f-84e0a5237155.animatn differ diff --git a/indra/newview/app_settings/static_assets/4c450f9e-07c0-2f5a-bc89-57de56db8ba1.gesture b/indra/newview/app_settings/static_assets/4c450f9e-07c0-2f5a-bc89-57de56db8ba1.gesture new file mode 100644 index 0000000000..69e35f111a Binary files /dev/null and b/indra/newview/app_settings/static_assets/4c450f9e-07c0-2f5a-bc89-57de56db8ba1.gesture differ diff --git a/indra/newview/app_settings/static_assets/4f23cc4a-712e-aabc-afcf-3cab4c1164ea.gesture b/indra/newview/app_settings/static_assets/4f23cc4a-712e-aabc-afcf-3cab4c1164ea.gesture new file mode 100644 index 0000000000..9d7e59fa5c Binary files /dev/null and b/indra/newview/app_settings/static_assets/4f23cc4a-712e-aabc-afcf-3cab4c1164ea.gesture differ diff --git a/indra/newview/app_settings/static_assets/510cdb99-1764-a0ef-a7e7-beb70e8dc4a4.clothing b/indra/newview/app_settings/static_assets/510cdb99-1764-a0ef-a7e7-beb70e8dc4a4.clothing new file mode 100644 index 0000000000..f4b6eb599a --- /dev/null +++ b/indra/newview/app_settings/static_assets/510cdb99-1764-a0ef-a7e7-beb70e8dc4a4.clothing @@ -0,0 +1,33 @@ +LLWearable version 22 +RASL F PLAY BODICE TOP 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 60b3592a-2499-20ce-e88b-db35fdba13ea diff --git a/indra/newview/app_settings/static_assets/514af488-9051-044a-b3fc-d4dbf76377c6.animatn b/indra/newview/app_settings/static_assets/514af488-9051-044a-b3fc-d4dbf76377c6.animatn new file mode 100644 index 0000000000..2609059435 Binary files /dev/null and b/indra/newview/app_settings/static_assets/514af488-9051-044a-b3fc-d4dbf76377c6.animatn differ diff --git a/indra/newview/app_settings/static_assets/51f3b303-a783-f0bd-9e98-9c094be13653.bodypart b/indra/newview/app_settings/static_assets/51f3b303-a783-f0bd-9e98-9c094be13653.bodypart new file mode 100644 index 0000000000..5b6ad1d1ce --- /dev/null +++ b/indra/newview/app_settings/static_assets/51f3b303-a783-f0bd-9e98-9c094be13653.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL M LEARN EYEBROWSHAPER + + 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 2 +parameters 39 +16 .76 +31 .62 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -1.18 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/522d4d1d-0f75-c3e7-af30-990e5f394438.gesture b/indra/newview/app_settings/static_assets/522d4d1d-0f75-c3e7-af30-990e5f394438.gesture new file mode 100644 index 0000000000..e9bab5d5a5 Binary files /dev/null and b/indra/newview/app_settings/static_assets/522d4d1d-0f75-c3e7-af30-990e5f394438.gesture differ diff --git a/indra/newview/app_settings/static_assets/52d9684f-2dcf-c252-2360-186b4236d07e.gesture b/indra/newview/app_settings/static_assets/52d9684f-2dcf-c252-2360-186b4236d07e.gesture new file mode 100644 index 0000000000..f964630f2d Binary files /dev/null and b/indra/newview/app_settings/static_assets/52d9684f-2dcf-c252-2360-186b4236d07e.gesture differ diff --git a/indra/newview/app_settings/static_assets/5480a924-8b06-9551-2af7-bf59452870e5.gesture b/indra/newview/app_settings/static_assets/5480a924-8b06-9551-2af7-bf59452870e5.gesture new file mode 100644 index 0000000000..b4c2dfedf0 Binary files /dev/null and b/indra/newview/app_settings/static_assets/5480a924-8b06-9551-2af7-bf59452870e5.gesture differ diff --git a/indra/newview/app_settings/static_assets/55c19b40-5303-d6ab-f003-5a2d926f4738.bodypart b/indra/newview/app_settings/static_assets/55c19b40-5303-d6ab-f003-5a2d926f4738.bodypart new file mode 100644 index 0000000000..e312715137 --- /dev/null +++ b/indra/newview/app_settings/static_assets/55c19b40-5303-d6ab-f003-5a2d926f4738.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL M EXPLORE EYEBROWSHAPER + + 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 2 +parameters 39 +16 1.18 +31 .42 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -.16 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/56e0ba0d-4a9f-7f27-6117-32f2ebbf6135.animatn b/indra/newview/app_settings/static_assets/56e0ba0d-4a9f-7f27-6117-32f2ebbf6135.animatn new file mode 100644 index 0000000000..31b74675d1 Binary files /dev/null and b/indra/newview/app_settings/static_assets/56e0ba0d-4a9f-7f27-6117-32f2ebbf6135.animatn differ diff --git a/indra/newview/app_settings/static_assets/5725fae1-0087-ec20-a4a0-eaa82d5c121b.bodypart b/indra/newview/app_settings/static_assets/5725fae1-0087-ec20-a4a0-eaa82d5c121b.bodypart new file mode 100644 index 0000000000..61fde63bae --- /dev/null +++ b/indra/newview/app_settings/static_assets/5725fae1-0087-ec20-a4a0-eaa82d5c121b.bodypart @@ -0,0 +1,26 @@ +LLWearable version 22 +RASL - Eyes - Amber Brown + + permissions 0 + { + base_mask 00082000 + owner_mask 00082000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00082000 + creator_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + owner_id 79908808-d272-49a8-864a-d133a10931e9 + last_owner_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + 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 f8230eaa-0afb-8eee-9891-030cfdfa6640 diff --git a/indra/newview/app_settings/static_assets/5747a48e-073e-c331-f6f3-7c2149613d3e.animatn b/indra/newview/app_settings/static_assets/5747a48e-073e-c331-f6f3-7c2149613d3e.animatn new file mode 100644 index 0000000000..bd25f7755f Binary files /dev/null and b/indra/newview/app_settings/static_assets/5747a48e-073e-c331-f6f3-7c2149613d3e.animatn differ diff --git a/indra/newview/app_settings/static_assets/57abaae6-1d17-7b1b-5f98-6d11a6411276.animatn b/indra/newview/app_settings/static_assets/57abaae6-1d17-7b1b-5f98-6d11a6411276.animatn new file mode 100644 index 0000000000..5dac9c0738 Binary files /dev/null and b/indra/newview/app_settings/static_assets/57abaae6-1d17-7b1b-5f98-6d11a6411276.animatn differ diff --git a/indra/newview/app_settings/static_assets/57cbd4f1-c53e-020f-f455-5ad2a5bab98d.bodypart b/indra/newview/app_settings/static_assets/57cbd4f1-c53e-020f-f455-5ad2a5bab98d.bodypart new file mode 100644 index 0000000000..fd0a90ed1f --- /dev/null +++ b/indra/newview/app_settings/static_assets/57cbd4f1-c53e-020f-f455-5ad2a5bab98d.bodypart @@ -0,0 +1,105 @@ +LLWearable version 22 +RASL F LEARN SHAPE (ANNA) + + 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 0 +2 -.47 +4 -.06 +5 .15 +6 -.05 +7 .2 +8 -.26 +10 .17 +11 .24 +12 -.08 +13 .21 +14 .55 +15 -.28 +17 -.08 +18 .7 +19 -.3 +20 -.06 +21 -.05 +22 0 +23 -.4 +24 .25 +25 -.32 +27 -.47 +33 .58 +34 .07 +35 -.1 +36 -1.1 +37 -1.16 +38 -.16 +80 0 +105 .47 +155 -.42 +157 .04 +185 -.6 +193 .54 +196 -1.07 +505 .31 +506 -.44 +507 0 +515 -1 +517 -.08 +518 .24 +629 .44 +637 .06 +646 -.01 +647 -.09 +649 .34 +650 -.15 +652 .34 +653 .38 +656 0 +659 .59 +662 .5 +663 0 +664 0 +665 .08 +675 -.19 +676 -.37 +678 .5 +682 .52 +683 -.2 +684 .18 +685 0 +690 .37 +692 .2 +693 .22 +753 .51 +756 -.38 +758 .06 +759 -.05 +760 .72 +764 .35 +765 -.08 +769 .45 +773 .53 +795 .21 +796 .01 +799 .55 +841 .02 +842 .16 +879 0 +880 -.85 +textures 0 diff --git a/indra/newview/app_settings/static_assets/590b2eac-a9fc-1e22-7874-782e3ded97d2.bodypart b/indra/newview/app_settings/static_assets/590b2eac-a9fc-1e22-7874-782e3ded97d2.bodypart new file mode 100644 index 0000000000..d0fb089ba0 --- /dev/null +++ b/indra/newview/app_settings/static_assets/590b2eac-a9fc-1e22-7874-782e3ded97d2.bodypart @@ -0,0 +1,105 @@ +LLWearable version 22 +RASL F CREATE SHAPE (POPPY) + + 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 .02 +2 -.44 +4 -.06 +5 -.02 +6 -.05 +7 .02 +8 -.42 +10 .3 +11 .24 +12 -.23 +13 0 +14 .46 +15 -.28 +17 .25 +18 -.38 +19 -.45 +20 -.14 +21 -.02 +22 0 +23 -.46 +24 .22 +25 .19 +27 -.47 +33 .58 +34 .07 +35 -.1 +36 -1 +37 -1.04 +38 -.24 +80 0 +105 .53 +155 -.44 +157 0 +185 -.62 +193 .46 +196 -1.13 +505 .35 +506 -.68 +507 -.24 +515 -1 +517 -.05 +518 .24 +629 .5 +637 .06 +646 -.08 +647 -.17 +649 .32 +650 0 +652 .37 +653 .35 +656 0 +659 .57 +662 .5 +663 0 +664 0 +665 .08 +675 -.17 +676 -.49 +678 .5 +682 .53 +683 -.17 +684 .04 +685 0 +690 .39 +692 .3 +693 .2 +753 .55 +756 -.38 +758 .06 +759 .17 +760 .85 +764 .32 +765 -.08 +769 .45 +773 .53 +795 .2 +796 .08 +799 .5 +841 -.02 +842 .06 +879 0 +880 -.85 +textures 0 diff --git a/indra/newview/app_settings/static_assets/59332ea5-2a75-9ede-9ab7-f0ae70bbffcc.clothing b/indra/newview/app_settings/static_assets/59332ea5-2a75-9ede-9ab7-f0ae70bbffcc.clothing new file mode 100644 index 0000000000..b7c0342844 --- /dev/null +++ b/indra/newview/app_settings/static_assets/59332ea5-2a75-9ede-9ab7-f0ae70bbffcc.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL MSHOE 5 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 0 +503 0 +508 .02 +513 .29 +514 .27 +616 .1 +654 0 +812 1 +813 1 +817 1 +textures 1 +7 85b13d86-3e95-8d4b-a03b-c9c737631194 diff --git a/indra/newview/app_settings/static_assets/5a68100b-e6ba-5170-649c-80beddc67035.gesture b/indra/newview/app_settings/static_assets/5a68100b-e6ba-5170-649c-80beddc67035.gesture new file mode 100644 index 0000000000..548369d81d Binary files /dev/null and b/indra/newview/app_settings/static_assets/5a68100b-e6ba-5170-649c-80beddc67035.gesture differ diff --git a/indra/newview/app_settings/static_assets/5a977ed9-7f72-44e9-4c4c-6e913df8ae74.animatn b/indra/newview/app_settings/static_assets/5a977ed9-7f72-44e9-4c4c-6e913df8ae74.animatn new file mode 100644 index 0000000000..700f4e2969 Binary files /dev/null and b/indra/newview/app_settings/static_assets/5a977ed9-7f72-44e9-4c4c-6e913df8ae74.animatn differ diff --git a/indra/newview/app_settings/static_assets/5af7de1f-e517-ae9a-13d8-4760c1ab4cc3.bodypart b/indra/newview/app_settings/static_assets/5af7de1f-e517-ae9a-13d8-4760c1ab4cc3.bodypart new file mode 100644 index 0000000000..46833ce4b5 --- /dev/null +++ b/indra/newview/app_settings/static_assets/5af7de1f-e517-ae9a-13d8-4760c1ab4cc3.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 d7bef979-ed48-e7ce-079a-b19a3c5a144a diff --git a/indra/newview/app_settings/static_assets/5bac881c-fff8-b19a-49eb-ba253eb5af04.bodypart b/indra/newview/app_settings/static_assets/5bac881c-fff8-b19a-49eb-ba253eb5af04.bodypart new file mode 100644 index 0000000000..ed4033a1f6 --- /dev/null +++ b/indra/newview/app_settings/static_assets/5bac881c-fff8-b19a-49eb-ba253eb5af04.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL F EXPLORE EYEBROWSHAPER + + 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 2 +parameters 39 +16 .9 +31 .34 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 .14 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/5c682a95-6da4-a463-0bf6-0f5b7be129d1.animatn b/indra/newview/app_settings/static_assets/5c682a95-6da4-a463-0bf6-0f5b7be129d1.animatn new file mode 100644 index 0000000000..a7da5e8591 Binary files /dev/null and b/indra/newview/app_settings/static_assets/5c682a95-6da4-a463-0bf6-0f5b7be129d1.animatn differ diff --git a/indra/newview/app_settings/static_assets/5dde08b6-59ec-5ca3-92a0-b9d7f532a768.bodypart b/indra/newview/app_settings/static_assets/5dde08b6-59ec-5ca3-92a0-b9d7f532a768.bodypart new file mode 100644 index 0000000000..10f197a1d3 --- /dev/null +++ b/indra/newview/app_settings/static_assets/5dde08b6-59ec-5ca3-92a0-b9d7f532a768.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL M PLAY EYEBROWSHAPER + + 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 2 +parameters 39 +16 .69 +31 .4 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -.4 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/5ea3991f-c293-392e-6860-91dfa01278a3.animatn b/indra/newview/app_settings/static_assets/5ea3991f-c293-392e-6860-91dfa01278a3.animatn new file mode 100644 index 0000000000..f2e65858a4 Binary files /dev/null and b/indra/newview/app_settings/static_assets/5ea3991f-c293-392e-6860-91dfa01278a3.animatn differ diff --git a/indra/newview/app_settings/static_assets/6061a81b-e6bf-5909-b86a-268e5c6b28c3.clothing b/indra/newview/app_settings/static_assets/6061a81b-e6bf-5909-b86a-268e5c6b28c3.clothing new file mode 100644 index 0000000000..cc6a8e1dac --- /dev/null +++ b/indra/newview/app_settings/static_assets/6061a81b-e6bf-5909-b86a-268e5c6b28c3.clothing @@ -0,0 +1,29 @@ +LLWearable version 22 +RASL F EXPLORE 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 0bcd9123-fb74-5d95-e9e2-d0e4f8677405 diff --git a/indra/newview/app_settings/static_assets/6212ffdd-d447-a92f-18f3-8cb94a799d83.gesture b/indra/newview/app_settings/static_assets/6212ffdd-d447-a92f-18f3-8cb94a799d83.gesture new file mode 100644 index 0000000000..b94ccdbfec Binary files /dev/null and b/indra/newview/app_settings/static_assets/6212ffdd-d447-a92f-18f3-8cb94a799d83.gesture differ diff --git a/indra/newview/app_settings/static_assets/62c5de58-cb33-5743-3d07-9e4cd4352864.animatn b/indra/newview/app_settings/static_assets/62c5de58-cb33-5743-3d07-9e4cd4352864.animatn new file mode 100644 index 0000000000..1e83b0de36 Binary files /dev/null and b/indra/newview/app_settings/static_assets/62c5de58-cb33-5743-3d07-9e4cd4352864.animatn differ diff --git a/indra/newview/app_settings/static_assets/631feb23-6f72-ae9c-dd5e-51510bbe235b.clothing b/indra/newview/app_settings/static_assets/631feb23-6f72-ae9c-dd5e-51510bbe235b.clothing new file mode 100644 index 0000000000..92e6564525 --- /dev/null +++ b/indra/newview/app_settings/static_assets/631feb23-6f72-ae9c-dd5e-51510bbe235b.clothing @@ -0,0 +1,33 @@ +LLWearable version 22 +RASL F EXPLORE TANK 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 bc23416d-7993-17bf-d5e0-bcfae808be73 diff --git a/indra/newview/app_settings/static_assets/633b2da6-a46f-8de8-5fe6-1256fd48d991.bodypart b/indra/newview/app_settings/static_assets/633b2da6-a46f-8de8-5fe6-1256fd48d991.bodypart new file mode 100644 index 0000000000..b129dfc609 --- /dev/null +++ b/indra/newview/app_settings/static_assets/633b2da6-a46f-8de8-5fe6-1256fd48d991.bodypart @@ -0,0 +1,52 @@ +LLWearable version 22 +Male Designer Skin + + 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 ddcc80fe-8da3-0eb7-cad6-ae35f76c99ab +5 f4e585de-8cc8-fecd-6eba-b3ec663161a1 +6 8bd9935f-97dd-bed2-1a46-df194013d737 diff --git a/indra/newview/app_settings/static_assets/63af4bbd-7dba-fb00-01f6-bc2126ece403.gesture b/indra/newview/app_settings/static_assets/63af4bbd-7dba-fb00-01f6-bc2126ece403.gesture new file mode 100644 index 0000000000..0c958c6ca2 Binary files /dev/null and b/indra/newview/app_settings/static_assets/63af4bbd-7dba-fb00-01f6-bc2126ece403.gesture differ diff --git a/indra/newview/app_settings/static_assets/666307d9-a860-572d-6fd4-c3ab8865c094.animatn b/indra/newview/app_settings/static_assets/666307d9-a860-572d-6fd4-c3ab8865c094.animatn new file mode 100644 index 0000000000..c8d940b886 Binary files /dev/null and b/indra/newview/app_settings/static_assets/666307d9-a860-572d-6fd4-c3ab8865c094.animatn differ diff --git a/indra/newview/app_settings/static_assets/66d174a6-66dc-cfe4-5b51-48b3be18d099.clothing b/indra/newview/app_settings/static_assets/66d174a6-66dc-cfe4-5b51-48b3be18d099.clothing new file mode 100644 index 0000000000..d8679b7cd7 --- /dev/null +++ b/indra/newview/app_settings/static_assets/66d174a6-66dc-cfe4-5b51-48b3be18d099.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL F PLAY BODICE TOP UP + + 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 618cc16f-fcfa-12a3-1896-be4e87ca09a0 diff --git a/indra/newview/app_settings/static_assets/66ecd9bd-22e1-2633-f41e-ad1a38205662.gesture b/indra/newview/app_settings/static_assets/66ecd9bd-22e1-2633-f41e-ad1a38205662.gesture new file mode 100644 index 0000000000..38b70758b7 Binary files /dev/null and b/indra/newview/app_settings/static_assets/66ecd9bd-22e1-2633-f41e-ad1a38205662.gesture differ diff --git a/indra/newview/app_settings/static_assets/6802d553-49da-0778-9f85-1599a2266526.animatn b/indra/newview/app_settings/static_assets/6802d553-49da-0778-9f85-1599a2266526.animatn new file mode 100644 index 0000000000..ecf9138483 Binary files /dev/null and b/indra/newview/app_settings/static_assets/6802d553-49da-0778-9f85-1599a2266526.animatn differ diff --git a/indra/newview/app_settings/static_assets/6883a61a-b27b-5914-a61e-dda118a9ee2c.animatn b/indra/newview/app_settings/static_assets/6883a61a-b27b-5914-a61e-dda118a9ee2c.animatn new file mode 100644 index 0000000000..3c18b3db3f Binary files /dev/null and b/indra/newview/app_settings/static_assets/6883a61a-b27b-5914-a61e-dda118a9ee2c.animatn differ diff --git a/indra/newview/app_settings/static_assets/68efa755-f0dd-8da2-38e9-bc9ea6b4ddd6.gesture b/indra/newview/app_settings/static_assets/68efa755-f0dd-8da2-38e9-bc9ea6b4ddd6.gesture new file mode 100644 index 0000000000..1af6225189 Binary files /dev/null and b/indra/newview/app_settings/static_assets/68efa755-f0dd-8da2-38e9-bc9ea6b4ddd6.gesture differ diff --git a/indra/newview/app_settings/static_assets/693f12af-3bd9-8dcd-0395-32a967cc812d.bodypart b/indra/newview/app_settings/static_assets/693f12af-3bd9-8dcd-0395-32a967cc812d.bodypart new file mode 100644 index 0000000000..7e72d3e941 --- /dev/null +++ b/indra/newview/app_settings/static_assets/693f12af-3bd9-8dcd-0395-32a967cc812d.bodypart @@ -0,0 +1,52 @@ +LLWearable version 22 +RASL M EXPLORE SKIN (LOUIS) + + 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 186d9ce8-d1bd-b0d9-4c1e-e2d0faf4d6ca +5 959fdef8-ca08-4059-5468-0431a14b11fe +6 a2200068-757a-6b58-6693-02129927627e diff --git a/indra/newview/app_settings/static_assets/697ed804-815c-f195-597c-dce51b86713b.bodypart b/indra/newview/app_settings/static_assets/697ed804-815c-f195-597c-dce51b86713b.bodypart new file mode 100644 index 0000000000..a8f1d47c94 --- /dev/null +++ b/indra/newview/app_settings/static_assets/697ed804-815c-f195-597c-dce51b86713b.bodypart @@ -0,0 +1,26 @@ +LLWearable version 22 +RASL - Eyes - Spring Green + + permissions 0 + { + base_mask 00082000 + owner_mask 00082000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00082000 + creator_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + owner_id 79908808-d272-49a8-864a-d133a10931e9 + last_owner_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + 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 c0871f57-c220-1a17-941a-bc953763f317 diff --git a/indra/newview/app_settings/static_assets/69a2052e-1777-df94-49bd-8675ca576d87.clothing b/indra/newview/app_settings/static_assets/69a2052e-1777-df94-49bd-8675ca576d87.clothing new file mode 100644 index 0000000000..18943d93fa --- /dev/null +++ b/indra/newview/app_settings/static_assets/69a2052e-1777-df94-49bd-8675ca576d87.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL M PLAY 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 9cc05d27-0088-dfea-2cd7-1573812decdf +14 f13c2b07-21d3-e913-e848-4aad3b8044f9 diff --git a/indra/newview/app_settings/static_assets/6af61452-5a3b-7fd3-4604-dc397aa9184b.bodypart b/indra/newview/app_settings/static_assets/6af61452-5a3b-7fd3-4604-dc397aa9184b.bodypart new file mode 100644 index 0000000000..2f0f5b3692 --- /dev/null +++ b/indra/newview/app_settings/static_assets/6af61452-5a3b-7fd3-4604-dc397aa9184b.bodypart @@ -0,0 +1,105 @@ +LLWearable version 22 +RASL M LOVE SHAPE (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 0 +parameters 82 +1 .16 +2 -.21 +4 .17 +5 .44 +6 .02 +7 -.24 +8 -.14 +10 .88 +11 .4 +12 -.08 +13 .68 +14 .63 +15 -.22 +17 .22 +18 .66 +19 -.43 +20 -.26 +21 .31 +22 .57 +23 -.44 +24 -.14 +25 -.02 +27 .05 +33 1.14 +34 -.26 +35 -.07 +36 -.52 +37 -.14 +38 -.1 +80 1 +105 .5 +155 -.22 +157 .02 +185 -.76 +193 .73 +196 -.98 +505 .49 +506 -.12 +507 0 +515 -1 +517 -.25 +518 -.08 +629 .37 +637 .05 +646 .1 +647 -.02 +649 .5 +650 .05 +652 .46 +653 .38 +656 0 +659 .54 +662 .5 +663 0 +664 0 +665 .08 +675 -.12 +676 -.22 +678 .46 +682 .57 +683 -.05 +684 0 +685 .08 +690 .46 +692 .18 +693 .2 +753 1 +756 -.78 +758 -.42 +759 .75 +760 .24 +764 .23 +765 .15 +769 .45 +773 .45 +795 .26 +796 .28 +799 .52 +841 .02 +842 0 +879 .17 +880 -.8 +textures 0 diff --git a/indra/newview/app_settings/static_assets/6b61c8e8-4747-0d75-12d7-e49ff207a4ca.animatn b/indra/newview/app_settings/static_assets/6b61c8e8-4747-0d75-12d7-e49ff207a4ca.animatn new file mode 100644 index 0000000000..d7218f8884 Binary files /dev/null and b/indra/newview/app_settings/static_assets/6b61c8e8-4747-0d75-12d7-e49ff207a4ca.animatn differ diff --git a/indra/newview/app_settings/static_assets/6bd01860-4ebd-127a-bb3d-d1427e8e0c42.animatn b/indra/newview/app_settings/static_assets/6bd01860-4ebd-127a-bb3d-d1427e8e0c42.animatn new file mode 100644 index 0000000000..80dc724546 Binary files /dev/null and b/indra/newview/app_settings/static_assets/6bd01860-4ebd-127a-bb3d-d1427e8e0c42.animatn differ diff --git a/indra/newview/app_settings/static_assets/6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0.animatn b/indra/newview/app_settings/static_assets/6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0.animatn new file mode 100644 index 0000000000..1daa254f9d Binary files /dev/null and b/indra/newview/app_settings/static_assets/6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0.animatn differ diff --git a/indra/newview/app_settings/static_assets/709ea28e-1573-c023-8bf8-520c8bc637fa.animatn b/indra/newview/app_settings/static_assets/709ea28e-1573-c023-8bf8-520c8bc637fa.animatn new file mode 100644 index 0000000000..d38b3c0a74 Binary files /dev/null and b/indra/newview/app_settings/static_assets/709ea28e-1573-c023-8bf8-520c8bc637fa.animatn differ diff --git a/indra/newview/app_settings/static_assets/70ea714f-3a97-d742-1b01-590a8fcd1db5.animatn b/indra/newview/app_settings/static_assets/70ea714f-3a97-d742-1b01-590a8fcd1db5.animatn new file mode 100644 index 0000000000..0eb2008999 Binary files /dev/null and b/indra/newview/app_settings/static_assets/70ea714f-3a97-d742-1b01-590a8fcd1db5.animatn differ diff --git a/indra/newview/app_settings/static_assets/72560c27-e48b-a6a5-10e3-d21dfb4bd4fb.clothing b/indra/newview/app_settings/static_assets/72560c27-e48b-a6a5-10e3-d21dfb4bd4fb.clothing new file mode 100644 index 0000000000..6755842945 --- /dev/null +++ b/indra/newview/app_settings/static_assets/72560c27-e48b-a6a5-10e3-d21dfb4bd4fb.clothing @@ -0,0 +1,29 @@ +LLWearable version 22 +RASL M PLAY TROUSERS + + 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 2aa30286-f800-8444-61ff-44d42a6a0511 diff --git a/indra/newview/app_settings/static_assets/7693f268-06c7-ea71-fa21-2b30d6533f8f.animatn b/indra/newview/app_settings/static_assets/7693f268-06c7-ea71-fa21-2b30d6533f8f.animatn new file mode 100644 index 0000000000..c08bd38ab1 Binary files /dev/null and b/indra/newview/app_settings/static_assets/7693f268-06c7-ea71-fa21-2b30d6533f8f.animatn differ diff --git a/indra/newview/app_settings/static_assets/76d30ee1-c369-12ec-8dbc-9cf2f51120ff.gesture b/indra/newview/app_settings/static_assets/76d30ee1-c369-12ec-8dbc-9cf2f51120ff.gesture new file mode 100644 index 0000000000..bab2b2b242 Binary files /dev/null and b/indra/newview/app_settings/static_assets/76d30ee1-c369-12ec-8dbc-9cf2f51120ff.gesture differ diff --git a/indra/newview/app_settings/static_assets/76f7ced2-4f91-31c8-ff7d-e76b19abfa40.gesture b/indra/newview/app_settings/static_assets/76f7ced2-4f91-31c8-ff7d-e76b19abfa40.gesture new file mode 100644 index 0000000000..4bb19bcced Binary files /dev/null and b/indra/newview/app_settings/static_assets/76f7ced2-4f91-31c8-ff7d-e76b19abfa40.gesture differ diff --git a/indra/newview/app_settings/static_assets/7700f429-88f0-7e57-7714-33c73ad1a4eb.clothing b/indra/newview/app_settings/static_assets/7700f429-88f0-7e57-7714-33c73ad1a4eb.clothing new file mode 100644 index 0000000000..0305abbb39 --- /dev/null +++ b/indra/newview/app_settings/static_assets/7700f429-88f0-7e57-7714-33c73ad1a4eb.clothing @@ -0,0 +1,29 @@ +LLWearable version 22 +RASL M LOVE PANTS (BUFF) + + 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 fbd237f4-1607-b3d4-f7a4-0a16d0eedc7b diff --git a/indra/newview/app_settings/static_assets/7705007b-f459-0b49-e8f3-dd4eff6f82c2.bodypart b/indra/newview/app_settings/static_assets/7705007b-f459-0b49-e8f3-dd4eff6f82c2.bodypart new file mode 100644 index 0000000000..2da36db083 --- /dev/null +++ b/indra/newview/app_settings/static_assets/7705007b-f459-0b49-e8f3-dd4eff6f82c2.bodypart @@ -0,0 +1,52 @@ +LLWearable version 22 +RASL M SHOP SKIN (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 1 +parameters 26 +108 .02 +110 0 +111 .6 +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 32140dec-f6a3-1262-3c60-85bae6a814f5 +5 76d19560-0882-6f0a-5c31-f3f825c3bd2a +6 198e53e7-cac5-849b-50bc-61b8b61efab2 diff --git a/indra/newview/app_settings/static_assets/790d7d90-eba9-d269-2d38-5cd2e36e7b93.clothing b/indra/newview/app_settings/static_assets/790d7d90-eba9-d269-2d38-5cd2e36e7b93.clothing new file mode 100644 index 0000000000..8e60fbbaee --- /dev/null +++ b/indra/newview/app_settings/static_assets/790d7d90-eba9-d269-2d38-5cd2e36e7b93.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL M SHOPPER SHOES FOOTSHAPER (WEAR) + + 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 0 +503 0 +508 -1 +513 0 +514 0 +616 .1 +654 0 +812 1 +813 1 +817 1 +textures 1 +7 85b13d86-3e95-8d4b-a03b-c9c737631194 diff --git a/indra/newview/app_settings/static_assets/792c8d21-c931-31be-0319-1779a0f8caf4.bodypart b/indra/newview/app_settings/static_assets/792c8d21-c931-31be-0319-1779a0f8caf4.bodypart new file mode 100644 index 0000000000..b6079bd443 --- /dev/null +++ b/indra/newview/app_settings/static_assets/792c8d21-c931-31be-0319-1779a0f8caf4.bodypart @@ -0,0 +1,26 @@ +LLWearable version 22 +RASL - Eyes - Baby Blue + + permissions 0 + { + base_mask 00082000 + owner_mask 00082000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00082000 + creator_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + owner_id 79908808-d272-49a8-864a-d133a10931e9 + last_owner_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + 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 5b3917e5-98d9-d830-4704-1ddba558a63f diff --git a/indra/newview/app_settings/static_assets/7a17b059-12b2-41b1-570a-186368b6aa6f.animatn b/indra/newview/app_settings/static_assets/7a17b059-12b2-41b1-570a-186368b6aa6f.animatn new file mode 100644 index 0000000000..0846f1d496 Binary files /dev/null and b/indra/newview/app_settings/static_assets/7a17b059-12b2-41b1-570a-186368b6aa6f.animatn differ diff --git a/indra/newview/app_settings/static_assets/7a4e87fe-de39-6fcb-6223-024b00893244.animatn b/indra/newview/app_settings/static_assets/7a4e87fe-de39-6fcb-6223-024b00893244.animatn new file mode 100644 index 0000000000..609ab5456f Binary files /dev/null and b/indra/newview/app_settings/static_assets/7a4e87fe-de39-6fcb-6223-024b00893244.animatn differ diff --git a/indra/newview/app_settings/static_assets/7db00ccd-f380-f3ee-439d-61968ec69c8a.animatn b/indra/newview/app_settings/static_assets/7db00ccd-f380-f3ee-439d-61968ec69c8a.animatn new file mode 100644 index 0000000000..18f7414824 Binary files /dev/null and b/indra/newview/app_settings/static_assets/7db00ccd-f380-f3ee-439d-61968ec69c8a.animatn differ diff --git a/indra/newview/app_settings/static_assets/7fa32e57-0b88-d0f5-37b5-65ddf513e341.clothing b/indra/newview/app_settings/static_assets/7fa32e57-0b88-d0f5-37b5-65ddf513e341.clothing new file mode 100644 index 0000000000..03e044bf48 --- /dev/null +++ b/indra/newview/app_settings/static_assets/7fa32e57-0b88-d0f5-37b5-65ddf513e341.clothing @@ -0,0 +1,28 @@ +LLWearable version 22 +RASL SOCKS 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 7 +parameters 4 +617 1 +818 1 +819 1 +820 1 +textures 1 +12 0f2bfcbd-7853-6386-bffe-90cf9cf54a04 diff --git a/indra/newview/app_settings/static_assets/80700431-74ec-a008-14f8-77575e73693f.animatn b/indra/newview/app_settings/static_assets/80700431-74ec-a008-14f8-77575e73693f.animatn new file mode 100644 index 0000000000..0d36c25a15 Binary files /dev/null and b/indra/newview/app_settings/static_assets/80700431-74ec-a008-14f8-77575e73693f.animatn differ diff --git a/indra/newview/app_settings/static_assets/81287180-509d-477c-b10d-d68e403d5bcb.clothing b/indra/newview/app_settings/static_assets/81287180-509d-477c-b10d-d68e403d5bcb.clothing new file mode 100644 index 0000000000..b6f17db2ff --- /dev/null +++ b/indra/newview/app_settings/static_assets/81287180-509d-477c-b10d-d68e403d5bcb.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL F LOVE DRESS 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 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 9be6ec18-3214-8b9f-b18c-3ec47b6a6e89 diff --git a/indra/newview/app_settings/static_assets/815c3d49-d7fa-0214-3053-8eb9e63fda4c.gesture b/indra/newview/app_settings/static_assets/815c3d49-d7fa-0214-3053-8eb9e63fda4c.gesture new file mode 100644 index 0000000000..19788395a6 Binary files /dev/null and b/indra/newview/app_settings/static_assets/815c3d49-d7fa-0214-3053-8eb9e63fda4c.gesture differ diff --git a/indra/newview/app_settings/static_assets/8175bd9f-ac1a-39e6-7cc6-93ab762f49bc.clothing b/indra/newview/app_settings/static_assets/8175bd9f-ac1a-39e6-7cc6-93ab762f49bc.clothing new file mode 100644 index 0000000000..188ae78603 --- /dev/null +++ b/indra/newview/app_settings/static_assets/8175bd9f-ac1a-39e6-7cc6-93ab762f49bc.clothing @@ -0,0 +1,33 @@ +LLWearable version 22 +RASL M PLAY SHIRT 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 ae40787c-0181-d962-9b90-c24b5f7900d0 diff --git a/indra/newview/app_settings/static_assets/82e99230-c906-1403-4d9c-3889dd98daba.animatn b/indra/newview/app_settings/static_assets/82e99230-c906-1403-4d9c-3889dd98daba.animatn new file mode 100644 index 0000000000..a2a652071b Binary files /dev/null and b/indra/newview/app_settings/static_assets/82e99230-c906-1403-4d9c-3889dd98daba.animatn differ diff --git a/indra/newview/app_settings/static_assets/83bf1baf-6fdc-9906-9ab7-3113a3728136.bodypart b/indra/newview/app_settings/static_assets/83bf1baf-6fdc-9906-9ab7-3113a3728136.bodypart new file mode 100644 index 0000000000..8b109b0708 --- /dev/null +++ b/indra/newview/app_settings/static_assets/83bf1baf-6fdc-9906-9ab7-3113a3728136.bodypart @@ -0,0 +1,52 @@ +LLWearable version 22 +RASL F PLAY SKIN (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 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 c6b218b1-4069-af37-7d2f-7a105d04c6a3 +5 c8247b60-0b8e-4ba0-fd7d-4f9c78f4bc02 +6 efd439e2-4a0e-4dc9-1182-9d3daf27696c diff --git a/indra/newview/app_settings/static_assets/83ff59fe-2346-f236-9009-4e3608af64c1.animatn b/indra/newview/app_settings/static_assets/83ff59fe-2346-f236-9009-4e3608af64c1.animatn new file mode 100644 index 0000000000..043d4499f6 Binary files /dev/null and b/indra/newview/app_settings/static_assets/83ff59fe-2346-f236-9009-4e3608af64c1.animatn differ diff --git a/indra/newview/app_settings/static_assets/85428680-6bf9-3e64-b489-6f81087c24bd.animatn b/indra/newview/app_settings/static_assets/85428680-6bf9-3e64-b489-6f81087c24bd.animatn new file mode 100644 index 0000000000..aef2a5a1d6 Binary files /dev/null and b/indra/newview/app_settings/static_assets/85428680-6bf9-3e64-b489-6f81087c24bd.animatn differ diff --git a/indra/newview/app_settings/static_assets/85995026-eade-5d78-d364-94a64512cb66.animatn b/indra/newview/app_settings/static_assets/85995026-eade-5d78-d364-94a64512cb66.animatn new file mode 100644 index 0000000000..00365219af Binary files /dev/null and b/indra/newview/app_settings/static_assets/85995026-eade-5d78-d364-94a64512cb66.animatn differ diff --git a/indra/newview/app_settings/static_assets/865c5fe0-aafb-671a-8ad5-778beb24b6f8.gesture b/indra/newview/app_settings/static_assets/865c5fe0-aafb-671a-8ad5-778beb24b6f8.gesture new file mode 100644 index 0000000000..07d55776a0 Binary files /dev/null and b/indra/newview/app_settings/static_assets/865c5fe0-aafb-671a-8ad5-778beb24b6f8.gesture differ diff --git a/indra/newview/app_settings/static_assets/869ecdad-a44b-671e-3266-56aef2e3ac2e.animatn b/indra/newview/app_settings/static_assets/869ecdad-a44b-671e-3266-56aef2e3ac2e.animatn new file mode 100644 index 0000000000..e713a97844 Binary files /dev/null and b/indra/newview/app_settings/static_assets/869ecdad-a44b-671e-3266-56aef2e3ac2e.animatn differ diff --git a/indra/newview/app_settings/static_assets/8868cfa3-5b82-97ab-dc38-ded906f7fd90.gesture b/indra/newview/app_settings/static_assets/8868cfa3-5b82-97ab-dc38-ded906f7fd90.gesture new file mode 100644 index 0000000000..25ec1d7c7c Binary files /dev/null and b/indra/newview/app_settings/static_assets/8868cfa3-5b82-97ab-dc38-ded906f7fd90.gesture differ diff --git a/indra/newview/app_settings/static_assets/8ac9b0b4-9409-383a-1339-5373895f5368.bodypart b/indra/newview/app_settings/static_assets/8ac9b0b4-9409-383a-1339-5373895f5368.bodypart new file mode 100644 index 0000000000..39303b4707 --- /dev/null +++ b/indra/newview/app_settings/static_assets/8ac9b0b4-9409-383a-1339-5373895f5368.bodypart @@ -0,0 +1,105 @@ +LLWearable version 22 +RASL F SHOP SHAPE (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 0 +parameters 82 +1 .44 +2 -.21 +4 .1 +5 .01 +6 .06 +7 .02 +8 -.44 +10 .08 +11 -.1 +12 .46 +13 .08 +14 .47 +15 -.2 +17 -.26 +18 1.14 +19 -.38 +20 -.1 +21 .07 +22 0 +23 -.42 +24 .08 +25 .33 +27 -.2 +33 .5 +34 -.02 +35 -.04 +36 -1 +37 -.56 +38 -.14 +80 0 +105 .4 +155 -.48 +157 .03 +185 -.12 +193 .63 +196 -.86 +505 .37 +506 -.12 +507 -.31 +515 -1 +517 .01 +518 .17 +629 .58 +637 .05 +646 .08 +647 -.25 +649 .3 +650 .5 +652 .4 +653 .56 +656 0 +659 .7 +662 .5 +663 0 +664 0 +665 -.28 +675 -.18 +676 -.19 +678 .5 +682 .52 +683 -.18 +684 .08 +685 0 +690 .39 +692 .1 +693 -.12 +753 .48 +756 -.3 +758 -.48 +759 .43 +760 .91 +764 .21 +765 -.3 +769 .63 +773 .38 +795 .19 +796 0 +799 .52 +841 .04 +842 -.4 +879 0 +880 -.77 +textures 0 diff --git a/indra/newview/app_settings/static_assets/8b102617-bcba-037b-86c1-b76219f90c88.animatn b/indra/newview/app_settings/static_assets/8b102617-bcba-037b-86c1-b76219f90c88.animatn new file mode 100644 index 0000000000..acf5967f4d Binary files /dev/null and b/indra/newview/app_settings/static_assets/8b102617-bcba-037b-86c1-b76219f90c88.animatn differ diff --git a/indra/newview/app_settings/static_assets/8b753e16-bd7d-2bb3-7765-671b7b31e77c.gesture b/indra/newview/app_settings/static_assets/8b753e16-bd7d-2bb3-7765-671b7b31e77c.gesture new file mode 100644 index 0000000000..ca1a9c1e3f Binary files /dev/null and b/indra/newview/app_settings/static_assets/8b753e16-bd7d-2bb3-7765-671b7b31e77c.gesture differ diff --git a/indra/newview/app_settings/static_assets/8ccf1744-1509-7537-0fb5-1d33d2eefaf8.bodypart b/indra/newview/app_settings/static_assets/8ccf1744-1509-7537-0fb5-1d33d2eefaf8.bodypart new file mode 100644 index 0000000000..f33c2368c3 --- /dev/null +++ b/indra/newview/app_settings/static_assets/8ccf1744-1509-7537-0fb5-1d33d2eefaf8.bodypart @@ -0,0 +1,26 @@ +LLWearable version 22 +RASL - Eyes - Med Brown + + permissions 0 + { + base_mask 0008c000 + owner_mask 0008c000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 0008c000 + creator_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + owner_id 79908808-d272-49a8-864a-d133a10931e9 + last_owner_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + 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 6744cd4d-ce43-feb5-e37f-72aef2730250 diff --git a/indra/newview/app_settings/static_assets/8dbc8a59-18ec-c9c0-8edf-ddcb8a749e5f.gesture b/indra/newview/app_settings/static_assets/8dbc8a59-18ec-c9c0-8edf-ddcb8a749e5f.gesture new file mode 100644 index 0000000000..8712d24674 Binary files /dev/null and b/indra/newview/app_settings/static_assets/8dbc8a59-18ec-c9c0-8edf-ddcb8a749e5f.gesture differ diff --git a/indra/newview/app_settings/static_assets/8ea9f72c-6e64-e6bf-34ed-2713f84db063.clothing b/indra/newview/app_settings/static_assets/8ea9f72c-6e64-e6bf-34ed-2713f84db063.clothing new file mode 100644 index 0000000000..dad4b77363 --- /dev/null +++ b/indra/newview/app_settings/static_assets/8ea9f72c-6e64-e6bf-34ed-2713f84db063.clothing @@ -0,0 +1,29 @@ +LLWearable version 22 +RASL F CREATE CAPRI PANTS + + 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 .99 +624 1 +824 1 +825 1 +826 1 +textures 1 +17 c529d836-cd39-a25c-40fc-c097e32390ed diff --git a/indra/newview/app_settings/static_assets/90bdcd26-2c6b-44a7-aab2-18c5a04f3fc3.gesture b/indra/newview/app_settings/static_assets/90bdcd26-2c6b-44a7-aab2-18c5a04f3fc3.gesture new file mode 100644 index 0000000000..5140f0791a Binary files /dev/null and b/indra/newview/app_settings/static_assets/90bdcd26-2c6b-44a7-aab2-18c5a04f3fc3.gesture differ diff --git a/indra/newview/app_settings/static_assets/90e38814-7029-18a2-70ea-346ca73569aa.bodypart b/indra/newview/app_settings/static_assets/90e38814-7029-18a2-70ea-346ca73569aa.bodypart new file mode 100644 index 0000000000..87c79dd107 --- /dev/null +++ b/indra/newview/app_settings/static_assets/90e38814-7029-18a2-70ea-346ca73569aa.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL M LOVE EYEBROWSHAPER + + 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 2 +parameters 39 +16 1.11 +31 .28 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -1.18 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/92624d3e-1068-f1aa-a5ec-8244585193ed.animatn b/indra/newview/app_settings/static_assets/92624d3e-1068-f1aa-a5ec-8244585193ed.animatn new file mode 100644 index 0000000000..fe6d26be2f Binary files /dev/null and b/indra/newview/app_settings/static_assets/92624d3e-1068-f1aa-a5ec-8244585193ed.animatn differ diff --git a/indra/newview/app_settings/static_assets/928cae18-e31d-76fd-9cc9-2f55160ff818.animatn b/indra/newview/app_settings/static_assets/928cae18-e31d-76fd-9cc9-2f55160ff818.animatn new file mode 100644 index 0000000000..f49ea1f4f9 Binary files /dev/null and b/indra/newview/app_settings/static_assets/928cae18-e31d-76fd-9cc9-2f55160ff818.animatn differ diff --git a/indra/newview/app_settings/static_assets/944890c6-1960-b1a7-f50a-c05651720d7e.bodypart b/indra/newview/app_settings/static_assets/944890c6-1960-b1a7-f50a-c05651720d7e.bodypart new file mode 100644 index 0000000000..4b50839c1c --- /dev/null +++ b/indra/newview/app_settings/static_assets/944890c6-1960-b1a7-f50a-c05651720d7e.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL F LEARN EYEBROWSHAPER + + 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 2 +parameters 39 +16 .41 +31 .62 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -.22 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/94669140-c63b-8805-5561-62f5e24206ea.bodypart b/indra/newview/app_settings/static_assets/94669140-c63b-8805-5561-62f5e24206ea.bodypart new file mode 100644 index 0000000000..7bd970ec36 --- /dev/null +++ b/indra/newview/app_settings/static_assets/94669140-c63b-8805-5561-62f5e24206ea.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL F CREATE EYEBROWSHAPER + + 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 2 +parameters 39 +16 .2 +31 .2 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -.52 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/951469f4-c7b2-c818-9dee-ad7eea8c30b7.animatn b/indra/newview/app_settings/static_assets/951469f4-c7b2-c818-9dee-ad7eea8c30b7.animatn new file mode 100644 index 0000000000..44226ce7a0 Binary files /dev/null and b/indra/newview/app_settings/static_assets/951469f4-c7b2-c818-9dee-ad7eea8c30b7.animatn differ diff --git a/indra/newview/app_settings/static_assets/9583adac-bc9b-a021-ab8f-26018db46ab5.gesture b/indra/newview/app_settings/static_assets/9583adac-bc9b-a021-ab8f-26018db46ab5.gesture new file mode 100644 index 0000000000..32144092b9 Binary files /dev/null and b/indra/newview/app_settings/static_assets/9583adac-bc9b-a021-ab8f-26018db46ab5.gesture differ diff --git a/indra/newview/app_settings/static_assets/97c5742d-1d74-9408-2bae-9738a9e9d084.gesture b/indra/newview/app_settings/static_assets/97c5742d-1d74-9408-2bae-9738a9e9d084.gesture new file mode 100644 index 0000000000..c63df50438 Binary files /dev/null and b/indra/newview/app_settings/static_assets/97c5742d-1d74-9408-2bae-9738a9e9d084.gesture differ diff --git a/indra/newview/app_settings/static_assets/9b0c1c4e-8ac7-7969-1494-28c874c4f668.animatn b/indra/newview/app_settings/static_assets/9b0c1c4e-8ac7-7969-1494-28c874c4f668.animatn new file mode 100644 index 0000000000..61af2498b8 Binary files /dev/null and b/indra/newview/app_settings/static_assets/9b0c1c4e-8ac7-7969-1494-28c874c4f668.animatn differ diff --git a/indra/newview/app_settings/static_assets/9b29cd61-c45b-5689-ded2-91756b8d76a9.animatn b/indra/newview/app_settings/static_assets/9b29cd61-c45b-5689-ded2-91756b8d76a9.animatn new file mode 100644 index 0000000000..26d3760f04 Binary files /dev/null and b/indra/newview/app_settings/static_assets/9b29cd61-c45b-5689-ded2-91756b8d76a9.animatn differ diff --git a/indra/newview/app_settings/static_assets/9b37423a-caf6-3bb6-f4e8-60a11ccee1af.bodypart b/indra/newview/app_settings/static_assets/9b37423a-caf6-3bb6-f4e8-60a11ccee1af.bodypart new file mode 100644 index 0000000000..b69a46aec8 --- /dev/null +++ b/indra/newview/app_settings/static_assets/9b37423a-caf6-3bb6-f4e8-60a11ccee1af.bodypart @@ -0,0 +1,105 @@ +LLWearable version 22 +RASL M PLAY SHAPE (HEATH) + + 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 -.16 +2 -.14 +4 .35 +5 .1 +6 -.04 +7 -.2 +8 -.28 +10 .52 +11 0 +12 .46 +13 .34 +14 .55 +15 -.24 +17 -.2 +18 .9 +19 -.25 +20 -.26 +21 .11 +22 .57 +23 -.5 +24 -.1 +25 .07 +27 -.27 +33 1.23 +34 -.26 +35 -.07 +36 -.52 +37 -.32 +38 -.14 +80 1 +105 .5 +155 -.13 +157 .02 +185 -.66 +193 .46 +196 -.77 +505 .5 +506 -.2 +507 0 +515 -1 +517 -.25 +518 -.08 +629 .37 +637 .05 +646 .17 +647 .07 +649 .5 +650 -.27 +652 .48 +653 .29 +656 0 +659 .55 +662 .5 +663 0 +664 0 +665 .08 +675 -.12 +676 -.4 +678 .43 +682 .57 +683 -.11 +684 0 +685 0 +690 .46 +692 .2 +693 .16 +753 1.08 +756 -.68 +758 -.42 +759 .32 +760 .78 +764 .45 +765 -.3 +769 .47 +773 .49 +795 .23 +796 .42 +799 .46 +841 .02 +842 .12 +879 .22 +880 -.75 +textures 0 diff --git a/indra/newview/app_settings/static_assets/9ba1c942-08be-e43a-fb29-16ad440efc50.animatn b/indra/newview/app_settings/static_assets/9ba1c942-08be-e43a-fb29-16ad440efc50.animatn new file mode 100644 index 0000000000..752a2af75e Binary files /dev/null and b/indra/newview/app_settings/static_assets/9ba1c942-08be-e43a-fb29-16ad440efc50.animatn differ diff --git a/indra/newview/app_settings/static_assets/9cde58a2-05ba-5c21-5c90-b76079185990.clothing b/indra/newview/app_settings/static_assets/9cde58a2-05ba-5c21-5c90-b76079185990.clothing new file mode 100644 index 0000000000..70fd59b07d --- /dev/null +++ b/indra/newview/app_settings/static_assets/9cde58a2-05ba-5c21-5c90-b76079185990.clothing @@ -0,0 +1,33 @@ +LLWearable version 22 +Male Designer Tank Down + + 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 5 +parameters 9 +625 0 +638 0 +806 1 +807 1 +808 1 +814 1 +815 .99 +816 .05 +869 0 +textures 1 +2 6b52d34e-bade-dcc4-5442-c186b5ecc5f1 diff --git a/indra/newview/app_settings/static_assets/9e439264-0a7b-9190-d128-995092499c28.gesture b/indra/newview/app_settings/static_assets/9e439264-0a7b-9190-d128-995092499c28.gesture new file mode 100644 index 0000000000..f9db489999 Binary files /dev/null and b/indra/newview/app_settings/static_assets/9e439264-0a7b-9190-d128-995092499c28.gesture differ diff --git a/indra/newview/app_settings/static_assets/9f496bd2-589a-709f-16cc-69bf7df1d36c.animatn b/indra/newview/app_settings/static_assets/9f496bd2-589a-709f-16cc-69bf7df1d36c.animatn new file mode 100644 index 0000000000..9934140148 Binary files /dev/null and b/indra/newview/app_settings/static_assets/9f496bd2-589a-709f-16cc-69bf7df1d36c.animatn differ diff --git a/indra/newview/app_settings/static_assets/a00917ca-047d-a3ea-d246-63265f904a6e.bodypart b/indra/newview/app_settings/static_assets/a00917ca-047d-a3ea-d246-63265f904a6e.bodypart new file mode 100644 index 0000000000..32b4842722 --- /dev/null +++ b/indra/newview/app_settings/static_assets/a00917ca-047d-a3ea-d246-63265f904a6e.bodypart @@ -0,0 +1,105 @@ +LLWearable version 22 +RASL M LEARN SHAPE (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 0 +parameters 82 +1 .55 +2 .02 +4 -.05 +5 -.01 +6 .09 +7 -.21 +8 .04 +10 .48 +11 .3 +12 -.08 +13 .06 +14 .19 +15 -.14 +17 -.09 +18 .5 +19 -.65 +20 -.1 +21 .08 +22 .57 +23 -.28 +24 -.28 +25 .33 +27 -.22 +33 1.1 +34 -.08 +35 0 +36 -.58 +37 0 +38 .08 +80 1 +105 .5 +155 -.28 +157 .05 +185 -.5 +193 .45 +196 -1.07 +505 .54 +506 0 +507 0 +515 -1 +517 -.2 +518 -.08 +629 .37 +637 .14 +646 .08 +647 -.22 +649 .5 +650 -.27 +652 .49 +653 .11 +656 0 +659 .54 +662 .5 +663 0 +664 0 +665 0 +675 -.1 +676 -.31 +678 .48 +682 .63 +683 -.08 +684 0 +685 .22 +690 .48 +692 0 +693 .12 +753 .76 +756 -.68 +758 -.6 +759 .5 +760 .82 +764 .78 +765 .54 +769 .5 +773 .45 +795 .26 +796 0 +799 .5 +841 -.02 +842 0 +879 .08 +880 -.7 +textures 0 diff --git a/indra/newview/app_settings/static_assets/a166cdc3-ea15-0c01-ca5b-d3fed6e3ca75.gesture b/indra/newview/app_settings/static_assets/a166cdc3-ea15-0c01-ca5b-d3fed6e3ca75.gesture new file mode 100644 index 0000000000..30dbec56e8 Binary files /dev/null and b/indra/newview/app_settings/static_assets/a166cdc3-ea15-0c01-ca5b-d3fed6e3ca75.gesture differ diff --git a/indra/newview/app_settings/static_assets/a41965be-10f2-1625-df3b-2fe35716998b.gesture b/indra/newview/app_settings/static_assets/a41965be-10f2-1625-df3b-2fe35716998b.gesture new file mode 100644 index 0000000000..c57bf21607 Binary files /dev/null and b/indra/newview/app_settings/static_assets/a41965be-10f2-1625-df3b-2fe35716998b.gesture differ diff --git a/indra/newview/app_settings/static_assets/a53d49ad-d705-dd1b-318e-4d1cf3c04a11.gesture b/indra/newview/app_settings/static_assets/a53d49ad-d705-dd1b-318e-4d1cf3c04a11.gesture new file mode 100644 index 0000000000..f23a6a4e41 Binary files /dev/null and b/indra/newview/app_settings/static_assets/a53d49ad-d705-dd1b-318e-4d1cf3c04a11.gesture differ diff --git a/indra/newview/app_settings/static_assets/a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6.animatn b/indra/newview/app_settings/static_assets/a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6.animatn new file mode 100644 index 0000000000..2aa7fa801a Binary files /dev/null and b/indra/newview/app_settings/static_assets/a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6.animatn differ diff --git a/indra/newview/app_settings/static_assets/a6a09cb1-0845-5ec0-051e-16bb79b30ddf.gesture b/indra/newview/app_settings/static_assets/a6a09cb1-0845-5ec0-051e-16bb79b30ddf.gesture new file mode 100644 index 0000000000..611df452a7 Binary files /dev/null and b/indra/newview/app_settings/static_assets/a6a09cb1-0845-5ec0-051e-16bb79b30ddf.gesture differ diff --git a/indra/newview/app_settings/static_assets/a8dee56f-2eae-9e7a-05a2-6fb92b97e21e.animatn b/indra/newview/app_settings/static_assets/a8dee56f-2eae-9e7a-05a2-6fb92b97e21e.animatn new file mode 100644 index 0000000000..fd70f4bbe7 Binary files /dev/null and b/indra/newview/app_settings/static_assets/a8dee56f-2eae-9e7a-05a2-6fb92b97e21e.animatn differ diff --git a/indra/newview/app_settings/static_assets/a8dee7f6-a796-12a0-91bd-abf2fff300cc.clothing b/indra/newview/app_settings/static_assets/a8dee7f6-a796-12a0-91bd-abf2fff300cc.clothing new file mode 100644 index 0000000000..8db5c61b15 --- /dev/null +++ b/indra/newview/app_settings/static_assets/a8dee7f6-a796-12a0-91bd-abf2fff300cc.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL F LEARN SWEATER (RED) + + 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 5c657bbe-1a1d-30e4-e5b3-27b1a4656ea8 +14 c78e709f-a23e-928a-b1cf-3ab8446c1e2b diff --git a/indra/newview/app_settings/static_assets/a94ef3a0-7119-67b6-67e0-d93d5b08a544.gesture b/indra/newview/app_settings/static_assets/a94ef3a0-7119-67b6-67e0-d93d5b08a544.gesture new file mode 100644 index 0000000000..66e3de573f Binary files /dev/null and b/indra/newview/app_settings/static_assets/a94ef3a0-7119-67b6-67e0-d93d5b08a544.gesture differ diff --git a/indra/newview/app_settings/static_assets/aa134404-7dac-7aca-2cba-435f9db875ca.animatn b/indra/newview/app_settings/static_assets/aa134404-7dac-7aca-2cba-435f9db875ca.animatn new file mode 100644 index 0000000000..f67371b87a Binary files /dev/null and b/indra/newview/app_settings/static_assets/aa134404-7dac-7aca-2cba-435f9db875ca.animatn differ diff --git a/indra/newview/app_settings/static_assets/aa9d6d53-2647-f731-97eb-e07a47febb57.bodypart b/indra/newview/app_settings/static_assets/aa9d6d53-2647-f731-97eb-e07a47febb57.bodypart new file mode 100644 index 0000000000..a2ba070675 --- /dev/null +++ b/indra/newview/app_settings/static_assets/aa9d6d53-2647-f731-97eb-e07a47febb57.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL M CREATE EYEBROWSHAPER + + 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 2 +parameters 39 +16 .97 +31 .28 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -.52 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/abe169ff-ee4d-0e22-aa03-19b8116fdd7a.clothing b/indra/newview/app_settings/static_assets/abe169ff-ee4d-0e22-aa03-19b8116fdd7a.clothing new file mode 100644 index 0000000000..a45bd8390f --- /dev/null +++ b/indra/newview/app_settings/static_assets/abe169ff-ee4d-0e22-aa03-19b8116fdd7a.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL F EXPLORE TANK UP + + 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 8059c9dd-b620-71bc-262b-1f2df45c7ad0 diff --git a/indra/newview/app_settings/static_assets/aca78492-0487-03ec-4eb5-5c8e76c837e1.gesture b/indra/newview/app_settings/static_assets/aca78492-0487-03ec-4eb5-5c8e76c837e1.gesture new file mode 100644 index 0000000000..c350917a98 Binary files /dev/null and b/indra/newview/app_settings/static_assets/aca78492-0487-03ec-4eb5-5c8e76c837e1.gesture differ diff --git a/indra/newview/app_settings/static_assets/ad22cda1-00c1-21cc-2f35-9ea5b8636f9e.gesture b/indra/newview/app_settings/static_assets/ad22cda1-00c1-21cc-2f35-9ea5b8636f9e.gesture new file mode 100644 index 0000000000..be5fc6258f Binary files /dev/null and b/indra/newview/app_settings/static_assets/ad22cda1-00c1-21cc-2f35-9ea5b8636f9e.gesture differ diff --git a/indra/newview/app_settings/static_assets/ad4e858f-08a7-e67a-4d55-b0fc18b2518b.clothing b/indra/newview/app_settings/static_assets/ad4e858f-08a7-e67a-4d55-b0fc18b2518b.clothing new file mode 100644 index 0000000000..07710607d6 --- /dev/null +++ b/indra/newview/app_settings/static_assets/ad4e858f-08a7-e67a-4d55-b0fc18b2518b.clothing @@ -0,0 +1,29 @@ +LLWearable version 22 +Male Designer Pants (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 11 +parameters 5 +619 1 +624 1 +824 1 +825 1 +826 1 +textures 1 +17 f0a74d98-6efb-c7d6-707c-bceb6140de12 diff --git a/indra/newview/app_settings/static_assets/ad88e068-dc0a-6ef2-5a97-929ad01d883b.gesture b/indra/newview/app_settings/static_assets/ad88e068-dc0a-6ef2-5a97-929ad01d883b.gesture new file mode 100644 index 0000000000..0a7bfab170 Binary files /dev/null and b/indra/newview/app_settings/static_assets/ad88e068-dc0a-6ef2-5a97-929ad01d883b.gesture differ diff --git a/indra/newview/app_settings/static_assets/aec4610c-757f-bc4e-c092-c6e9caf18daf.animatn b/indra/newview/app_settings/static_assets/aec4610c-757f-bc4e-c092-c6e9caf18daf.animatn new file mode 100644 index 0000000000..c7c69ef0e1 Binary files /dev/null and b/indra/newview/app_settings/static_assets/aec4610c-757f-bc4e-c092-c6e9caf18daf.animatn differ diff --git a/indra/newview/app_settings/static_assets/af2b8320-e579-2c41-b717-969759aeb3ca.gesture b/indra/newview/app_settings/static_assets/af2b8320-e579-2c41-b717-969759aeb3ca.gesture new file mode 100644 index 0000000000..17b233adb6 Binary files /dev/null and b/indra/newview/app_settings/static_assets/af2b8320-e579-2c41-b717-969759aeb3ca.gesture differ diff --git a/indra/newview/app_settings/static_assets/afb80807-4214-7f3c-55b8-00858f56d37a.gesture b/indra/newview/app_settings/static_assets/afb80807-4214-7f3c-55b8-00858f56d37a.gesture new file mode 100644 index 0000000000..921e03751d Binary files /dev/null and b/indra/newview/app_settings/static_assets/afb80807-4214-7f3c-55b8-00858f56d37a.gesture differ diff --git a/indra/newview/app_settings/static_assets/afd64d9d-572d-b4f1-69bc-a79f70768177.gesture b/indra/newview/app_settings/static_assets/afd64d9d-572d-b4f1-69bc-a79f70768177.gesture new file mode 100644 index 0000000000..2658e86a19 Binary files /dev/null and b/indra/newview/app_settings/static_assets/afd64d9d-572d-b4f1-69bc-a79f70768177.gesture differ diff --git a/indra/newview/app_settings/static_assets/b0dc417c-1f11-af36-2e80-7e7489fa7cdc.animatn b/indra/newview/app_settings/static_assets/b0dc417c-1f11-af36-2e80-7e7489fa7cdc.animatn new file mode 100644 index 0000000000..6f797ba1ff Binary files /dev/null and b/indra/newview/app_settings/static_assets/b0dc417c-1f11-af36-2e80-7e7489fa7cdc.animatn differ diff --git a/indra/newview/app_settings/static_assets/b1709c8d-ecd3-54a1-4f28-d55ac0840782.animatn b/indra/newview/app_settings/static_assets/b1709c8d-ecd3-54a1-4f28-d55ac0840782.animatn new file mode 100644 index 0000000000..de12bcd2a5 Binary files /dev/null and b/indra/newview/app_settings/static_assets/b1709c8d-ecd3-54a1-4f28-d55ac0840782.animatn differ diff --git a/indra/newview/app_settings/static_assets/b1dc34e2-c8fb-3885-3a7e-10be1d5589dd.clothing b/indra/newview/app_settings/static_assets/b1dc34e2-c8fb-3885-3a7e-10be1d5589dd.clothing new file mode 100644 index 0000000000..0cfb75ca7b --- /dev/null +++ b/indra/newview/app_settings/static_assets/b1dc34e2-c8fb-3885-3a7e-10be1d5589dd.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +Male Designer Tank Up + + 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 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 428dd646-734b-f43f-3550-f248bd9dfa10 diff --git a/indra/newview/app_settings/static_assets/b1ed7982-c68e-a982-7561-52a88a5298c0.animatn b/indra/newview/app_settings/static_assets/b1ed7982-c68e-a982-7561-52a88a5298c0.animatn new file mode 100644 index 0000000000..4852846250 Binary files /dev/null and b/indra/newview/app_settings/static_assets/b1ed7982-c68e-a982-7561-52a88a5298c0.animatn differ diff --git a/indra/newview/app_settings/static_assets/b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9.animatn b/indra/newview/app_settings/static_assets/b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9.animatn new file mode 100644 index 0000000000..2f2ea3b6b7 Binary files /dev/null and b/indra/newview/app_settings/static_assets/b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9.animatn differ diff --git a/indra/newview/app_settings/static_assets/b57c996d-cb06-43c8-749d-e9ce361f172e.gesture b/indra/newview/app_settings/static_assets/b57c996d-cb06-43c8-749d-e9ce361f172e.gesture new file mode 100644 index 0000000000..90ad3c4a9c Binary files /dev/null and b/indra/newview/app_settings/static_assets/b57c996d-cb06-43c8-749d-e9ce361f172e.gesture differ diff --git a/indra/newview/app_settings/static_assets/b5b4a67d-0aee-30d2-72cd-77b333e932ef.animatn b/indra/newview/app_settings/static_assets/b5b4a67d-0aee-30d2-72cd-77b333e932ef.animatn new file mode 100644 index 0000000000..a826b52b22 Binary files /dev/null and b/indra/newview/app_settings/static_assets/b5b4a67d-0aee-30d2-72cd-77b333e932ef.animatn differ diff --git a/indra/newview/app_settings/static_assets/b5ea617e-47cf-612b-2d99-8c6f6dcac218.gesture b/indra/newview/app_settings/static_assets/b5ea617e-47cf-612b-2d99-8c6f6dcac218.gesture new file mode 100644 index 0000000000..b31632c9e9 Binary files /dev/null and b/indra/newview/app_settings/static_assets/b5ea617e-47cf-612b-2d99-8c6f6dcac218.gesture differ diff --git a/indra/newview/app_settings/static_assets/b606cdd6-4c22-6cc0-4614-560e6b9beeba.clothing b/indra/newview/app_settings/static_assets/b606cdd6-4c22-6cc0-4614-560e6b9beeba.clothing new file mode 100644 index 0000000000..99d59fb544 --- /dev/null +++ b/indra/newview/app_settings/static_assets/b606cdd6-4c22-6cc0-4614-560e6b9beeba.clothing @@ -0,0 +1,33 @@ +LLWearable version 22 +RASL M LEARN 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 5 +parameters 9 +625 0 +638 0 +806 1 +807 1 +808 1 +814 1 +815 .99 +816 .05 +869 0 +textures 1 +2 dac82639-53da-a87b-0f30-9187b0aef7cc diff --git a/indra/newview/app_settings/static_assets/b68a3d7c-de9e-fc87-eec8-543d787e5b0d.animatn b/indra/newview/app_settings/static_assets/b68a3d7c-de9e-fc87-eec8-543d787e5b0d.animatn new file mode 100644 index 0000000000..891f63373a Binary files /dev/null and b/indra/newview/app_settings/static_assets/b68a3d7c-de9e-fc87-eec8-543d787e5b0d.animatn differ diff --git a/indra/newview/app_settings/static_assets/b6e66a0e-f8db-0d4b-9259-7e9b20562b73.bodypart b/indra/newview/app_settings/static_assets/b6e66a0e-f8db-0d4b-9259-7e9b20562b73.bodypart new file mode 100644 index 0000000000..602648df79 --- /dev/null +++ b/indra/newview/app_settings/static_assets/b6e66a0e-f8db-0d4b-9259-7e9b20562b73.bodypart @@ -0,0 +1,26 @@ +LLWearable version 22 +RASL - Eyes - Hazel Brown + + permissions 0 + { + base_mask 00082000 + owner_mask 00082000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00082000 + creator_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + owner_id 79908808-d272-49a8-864a-d133a10931e9 + last_owner_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + 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 3818dcc3-95c3-f20f-a6d6-626f39a1cef0 diff --git a/indra/newview/app_settings/static_assets/b6f560d1-e2ad-24df-344c-2943c47a6775.gesture b/indra/newview/app_settings/static_assets/b6f560d1-e2ad-24df-344c-2943c47a6775.gesture new file mode 100644 index 0000000000..5157c2b05d Binary files /dev/null and b/indra/newview/app_settings/static_assets/b6f560d1-e2ad-24df-344c-2943c47a6775.gesture differ diff --git a/indra/newview/app_settings/static_assets/b8c8b2a3-9008-1771-3bfc-90924955ab2d.animatn b/indra/newview/app_settings/static_assets/b8c8b2a3-9008-1771-3bfc-90924955ab2d.animatn new file mode 100644 index 0000000000..a1f6676f2e Binary files /dev/null and b/indra/newview/app_settings/static_assets/b8c8b2a3-9008-1771-3bfc-90924955ab2d.animatn differ diff --git a/indra/newview/app_settings/static_assets/b8de1c20-7eba-2101-f2e3-9ed132838dcc.bodypart b/indra/newview/app_settings/static_assets/b8de1c20-7eba-2101-f2e3-9ed132838dcc.bodypart new file mode 100644 index 0000000000..6e79fc0992 --- /dev/null +++ b/indra/newview/app_settings/static_assets/b8de1c20-7eba-2101-f2e3-9ed132838dcc.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL F SHOP EYEBROWSHAPER + + 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 2 +parameters 39 +16 1.22 +31 .22 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -.1 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/b906c4ba-703b-1940-32a3-0c7f7d791510.animatn b/indra/newview/app_settings/static_assets/b906c4ba-703b-1940-32a3-0c7f7d791510.animatn new file mode 100644 index 0000000000..403a9e9afe Binary files /dev/null and b/indra/newview/app_settings/static_assets/b906c4ba-703b-1940-32a3-0c7f7d791510.animatn differ diff --git a/indra/newview/app_settings/static_assets/ba38eeb2-d35f-0a07-0c04-0eb42fcc6010.gesture b/indra/newview/app_settings/static_assets/ba38eeb2-d35f-0a07-0c04-0eb42fcc6010.gesture new file mode 100644 index 0000000000..243be64fe5 Binary files /dev/null and b/indra/newview/app_settings/static_assets/ba38eeb2-d35f-0a07-0c04-0eb42fcc6010.gesture differ diff --git a/indra/newview/app_settings/static_assets/bacd48be-6733-7842-dd1f-8802e920f3ba.bodypart b/indra/newview/app_settings/static_assets/bacd48be-6733-7842-dd1f-8802e920f3ba.bodypart new file mode 100644 index 0000000000..7c017277e5 --- /dev/null +++ b/indra/newview/app_settings/static_assets/bacd48be-6733-7842-dd1f-8802e920f3ba.bodypart @@ -0,0 +1,26 @@ +LLWearable version 22 +RASL - Eyes - Spring Green + + permissions 0 + { + base_mask 00082000 + owner_mask 00082000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00082000 + creator_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + owner_id 79908808-d272-49a8-864a-d133a10931e9 + last_owner_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + 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 865e5c74-5e50-1036-58d2-1af9e2a50388 diff --git a/indra/newview/app_settings/static_assets/bc2ff144-9a36-fdd0-316d-d86f5c9a43ac.gesture b/indra/newview/app_settings/static_assets/bc2ff144-9a36-fdd0-316d-d86f5c9a43ac.gesture new file mode 100644 index 0000000000..4d547e3e75 Binary files /dev/null and b/indra/newview/app_settings/static_assets/bc2ff144-9a36-fdd0-316d-d86f5c9a43ac.gesture differ diff --git a/indra/newview/app_settings/static_assets/bd07ffa9-426c-69da-d27a-e54e4ebbc73c.bodypart b/indra/newview/app_settings/static_assets/bd07ffa9-426c-69da-d27a-e54e4ebbc73c.bodypart new file mode 100644 index 0000000000..cc255aff0b --- /dev/null +++ b/indra/newview/app_settings/static_assets/bd07ffa9-426c-69da-d27a-e54e4ebbc73c.bodypart @@ -0,0 +1,52 @@ +LLWearable version 22 +RASL - Skin - Anna + + 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 .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 173d7efa-899c-9a0d-64e4-3477fd4320e7 +5 37b87678-b628-7e53-0643-c2e1f763b578 +6 5f270355-3528-3c42-1e3c-d6ccb28646c5 diff --git a/indra/newview/app_settings/static_assets/be969774-2a2b-0534-daee-f69357ff4adf.clothing b/indra/newview/app_settings/static_assets/be969774-2a2b-0534-daee-f69357ff4adf.clothing new file mode 100644 index 0000000000..07ce5cfec3 --- /dev/null +++ b/indra/newview/app_settings/static_assets/be969774-2a2b-0534-daee-f69357ff4adf.clothing @@ -0,0 +1,28 @@ +LLWearable version 22 +RASL SOCKS BLACK + + 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 0f0046b0-1c69-5192-1fca-37d0e6667484 diff --git a/indra/newview/app_settings/static_assets/c0c4030f-c02b-49de-24ba-2331f43fe41c.animatn b/indra/newview/app_settings/static_assets/c0c4030f-c02b-49de-24ba-2331f43fe41c.animatn new file mode 100644 index 0000000000..831d273ce4 Binary files /dev/null and b/indra/newview/app_settings/static_assets/c0c4030f-c02b-49de-24ba-2331f43fe41c.animatn differ diff --git a/indra/newview/app_settings/static_assets/c1a68df8-3a01-4f17-0bab-10eb7df9c22a.clothing b/indra/newview/app_settings/static_assets/c1a68df8-3a01-4f17-0bab-10eb7df9c22a.clothing new file mode 100644 index 0000000000..bf27527241 --- /dev/null +++ b/indra/newview/app_settings/static_assets/c1a68df8-3a01-4f17-0bab-10eb7df9c22a.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL-FSHOE1-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 .19 +503 0 +508 0 +513 .4 +514 .5 +616 .1 +654 .78 +812 1 +813 1 +817 1 +textures 1 +7 85b13d86-3e95-8d4b-a03b-c9c737631194 diff --git a/indra/newview/app_settings/static_assets/c1bc7f36-3ba0-d844-f93c-93be945d644f.animatn b/indra/newview/app_settings/static_assets/c1bc7f36-3ba0-d844-f93c-93be945d644f.animatn new file mode 100644 index 0000000000..04c4a28e2a Binary files /dev/null and b/indra/newview/app_settings/static_assets/c1bc7f36-3ba0-d844-f93c-93be945d644f.animatn differ diff --git a/indra/newview/app_settings/static_assets/c272cb94-0081-49bb-d45e-aeda288b3c06.clothing b/indra/newview/app_settings/static_assets/c272cb94-0081-49bb-d45e-aeda288b3c06.clothing new file mode 100644 index 0000000000..4e32db73e0 --- /dev/null +++ b/indra/newview/app_settings/static_assets/c272cb94-0081-49bb-d45e-aeda288b3c06.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL M EXPLORE UNDER JACKET LEATHER + + 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 .66 +607 1 +608 1 +609 1 +780 1 +834 1 +835 1 +836 1 +877 0 +textures 2 +13 f0f6812f-33c5-21ec-87da-f92e1aa02b09 +14 85b13d86-3e95-8d4b-a03b-c9c737631194 diff --git a/indra/newview/app_settings/static_assets/c437fefd-6025-fd89-e65c-aec2732f3007.clothing b/indra/newview/app_settings/static_assets/c437fefd-6025-fd89-e65c-aec2732f3007.clothing new file mode 100644 index 0000000000..ba72109a56 --- /dev/null +++ b/indra/newview/app_settings/static_assets/c437fefd-6025-fd89-e65c-aec2732f3007.clothing @@ -0,0 +1,29 @@ +LLWearable version 22 +RASL M 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 9a1b1afd-b282-e667-5d87-8f90cfaf566b diff --git a/indra/newview/app_settings/static_assets/c4ca6188-9127-4f31-0158-23c4e2f93304.animatn b/indra/newview/app_settings/static_assets/c4ca6188-9127-4f31-0158-23c4e2f93304.animatn new file mode 100644 index 0000000000..f49d119c93 Binary files /dev/null and b/indra/newview/app_settings/static_assets/c4ca6188-9127-4f31-0158-23c4e2f93304.animatn differ diff --git a/indra/newview/app_settings/static_assets/c4d1b050-1784-feb4-474f-ec3b1f1a29cb.clothing b/indra/newview/app_settings/static_assets/c4d1b050-1784-feb4-474f-ec3b1f1a29cb.clothing new file mode 100644 index 0000000000..160e4e29d6 --- /dev/null +++ b/indra/newview/app_settings/static_assets/c4d1b050-1784-feb4-474f-ec3b1f1a29cb.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL M PLAY SHIRT UP + + 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 8759051a-93db-7a9f-2f98-fe4a932a27fb diff --git a/indra/newview/app_settings/static_assets/c521ad1f-06f0-8711-f313-5737a38f0d78.clothing b/indra/newview/app_settings/static_assets/c521ad1f-06f0-8711-f313-5737a38f0d78.clothing new file mode 100644 index 0000000000..1c1e623821 --- /dev/null +++ b/indra/newview/app_settings/static_assets/c521ad1f-06f0-8711-f313-5737a38f0d78.clothing @@ -0,0 +1,29 @@ +LLWearable version 22 +RASL F PLAY TROUSERS + + 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 18ffd31d-7386-8959-a761-b90242957e0c diff --git a/indra/newview/app_settings/static_assets/c541c47f-e0c0-058b-ad1a-d6ae3a4584d9.animatn b/indra/newview/app_settings/static_assets/c541c47f-e0c0-058b-ad1a-d6ae3a4584d9.animatn new file mode 100644 index 0000000000..b0ff77b617 Binary files /dev/null and b/indra/newview/app_settings/static_assets/c541c47f-e0c0-058b-ad1a-d6ae3a4584d9.animatn differ diff --git a/indra/newview/app_settings/static_assets/c5d0cab3-4a69-2f35-71ee-6dba0ce0c85c.bodypart b/indra/newview/app_settings/static_assets/c5d0cab3-4a69-2f35-71ee-6dba0ce0c85c.bodypart new file mode 100644 index 0000000000..1bda2ff2f9 --- /dev/null +++ b/indra/newview/app_settings/static_assets/c5d0cab3-4a69-2f35-71ee-6dba0ce0c85c.bodypart @@ -0,0 +1,105 @@ +LLWearable version 22 +RASL F LOVE SHAPE (GENA) + + 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 -.07 +2 -.4 +4 -.13 +5 .03 +6 -.05 +7 .02 +8 -.42 +10 .25 +11 .24 +12 -.26 +13 .15 +14 .55 +15 -.28 +17 .32 +18 .42 +19 -.5 +20 .02 +21 .13 +22 0 +23 -.46 +24 -.31 +25 .1 +27 -.05 +33 .5 +34 -.04 +35 -.1 +36 -1 +37 -.74 +38 -.28 +80 0 +105 .51 +155 -.39 +157 0 +185 -.66 +193 .5 +196 -1.04 +505 .39 +506 -.68 +507 -.45 +515 -1 +517 .07 +518 .24 +629 .5 +637 .06 +646 -.01 +647 -.14 +649 .33 +650 -.2 +652 .39 +653 .56 +656 0 +659 .53 +662 .5 +663 0 +664 0 +665 .16 +675 -.17 +676 -.13 +678 .5 +682 .51 +683 -.18 +684 -.03 +685 0 +690 .39 +692 .2 +693 .24 +753 .55 +756 -.4 +758 .09 +759 .1 +760 .69 +764 .61 +765 -.08 +769 .45 +773 .53 +795 .24 +796 0 +799 .53 +841 -.02 +842 -.08 +879 0 +880 -.62 +textures 0 diff --git a/indra/newview/app_settings/static_assets/c63ac707-6325-14c8-d681-54b81d0dff77.gesture b/indra/newview/app_settings/static_assets/c63ac707-6325-14c8-d681-54b81d0dff77.gesture new file mode 100644 index 0000000000..01c55a2cd8 Binary files /dev/null and b/indra/newview/app_settings/static_assets/c63ac707-6325-14c8-d681-54b81d0dff77.gesture differ diff --git a/indra/newview/app_settings/static_assets/c8d70bed-535b-3d97-5d17-6136a209fbe6.bodypart b/indra/newview/app_settings/static_assets/c8d70bed-535b-3d97-5d17-6136a209fbe6.bodypart new file mode 100644 index 0000000000..05794814f1 --- /dev/null +++ b/indra/newview/app_settings/static_assets/c8d70bed-535b-3d97-5d17-6136a209fbe6.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 bf7932bc-28cb-4fbf-e810-9145c37ea177 diff --git a/indra/newview/app_settings/static_assets/c8e42d32-7310-6906-c903-cab5d4a34656.animatn b/indra/newview/app_settings/static_assets/c8e42d32-7310-6906-c903-cab5d4a34656.animatn new file mode 100644 index 0000000000..8e7e5be75d Binary files /dev/null and b/indra/newview/app_settings/static_assets/c8e42d32-7310-6906-c903-cab5d4a34656.animatn differ diff --git a/indra/newview/app_settings/static_assets/ca5b3f14-3194-7a2b-c894-aa699b718d1f.animatn b/indra/newview/app_settings/static_assets/ca5b3f14-3194-7a2b-c894-aa699b718d1f.animatn new file mode 100644 index 0000000000..b67d552ac2 Binary files /dev/null and b/indra/newview/app_settings/static_assets/ca5b3f14-3194-7a2b-c894-aa699b718d1f.animatn differ diff --git a/indra/newview/app_settings/static_assets/cd28b69b-9c95-bb78-3f94-8d605ff1bb12.animatn b/indra/newview/app_settings/static_assets/cd28b69b-9c95-bb78-3f94-8d605ff1bb12.animatn new file mode 100644 index 0000000000..8c172a811c Binary files /dev/null and b/indra/newview/app_settings/static_assets/cd28b69b-9c95-bb78-3f94-8d605ff1bb12.animatn differ diff --git a/indra/newview/app_settings/static_assets/cd55f18e-c1bf-70a5-5b53-a114fdc44930.bodypart b/indra/newview/app_settings/static_assets/cd55f18e-c1bf-70a5-5b53-a114fdc44930.bodypart new file mode 100644 index 0000000000..4f5f6596ff --- /dev/null +++ b/indra/newview/app_settings/static_assets/cd55f18e-c1bf-70a5-5b53-a114fdc44930.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL M SHOP EYEBROW SHAPER + + 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 2 +parameters 39 +16 .62 +31 .38 +112 0 +113 .5 +114 .49 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -.82 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/cd7668a6-7011-d7e2-ead8-fc69eff1a104.animatn b/indra/newview/app_settings/static_assets/cd7668a6-7011-d7e2-ead8-fc69eff1a104.animatn new file mode 100644 index 0000000000..7e2c8f0ccd Binary files /dev/null and b/indra/newview/app_settings/static_assets/cd7668a6-7011-d7e2-ead8-fc69eff1a104.animatn differ diff --git a/indra/newview/app_settings/static_assets/ce58f877-251f-b025-9227-4be3456faf58.bodypart b/indra/newview/app_settings/static_assets/ce58f877-251f-b025-9227-4be3456faf58.bodypart new file mode 100644 index 0000000000..50623d380a --- /dev/null +++ b/indra/newview/app_settings/static_assets/ce58f877-251f-b025-9227-4be3456faf58.bodypart @@ -0,0 +1,26 @@ +LLWearable version 22 +RASL - Eyes - Med Blue + + permissions 0 + { + base_mask 00082000 + owner_mask 00082000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00082000 + creator_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + owner_id 79908808-d272-49a8-864a-d133a10931e9 + last_owner_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + 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 6531cb8f-dd4c-4171-091e-bd5789254ab7 diff --git a/indra/newview/app_settings/static_assets/cf03c095-647e-bd96-4ce2-63202cd5a171.clothing b/indra/newview/app_settings/static_assets/cf03c095-647e-bd96-4ce2-63202cd5a171.clothing new file mode 100644 index 0000000000..ca6747e342 --- /dev/null +++ b/indra/newview/app_settings/static_assets/cf03c095-647e-bd96-4ce2-63202cd5a171.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL M SHOP SWEATER UP + + 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 bd947b09-6c73-62c5-9c2f-8c4980df7c82 diff --git a/indra/newview/app_settings/static_assets/d08d1a27-9410-dbd7-cc4f-ae1a8837b49d.bodypart b/indra/newview/app_settings/static_assets/d08d1a27-9410-dbd7-cc4f-ae1a8837b49d.bodypart new file mode 100644 index 0000000000..50d212e76c --- /dev/null +++ b/indra/newview/app_settings/static_assets/d08d1a27-9410-dbd7-cc4f-ae1a8837b49d.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL F LOVE EYEBROWSHAPER + + 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 2 +parameters 39 +16 1.18 +31 .42 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -.94 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/d1b530a9-b4c8-aeaf-9300-9b9d30c715d1.clothing b/indra/newview/app_settings/static_assets/d1b530a9-b4c8-aeaf-9300-9b9d30c715d1.clothing new file mode 100644 index 0000000000..ac3a700c50 --- /dev/null +++ b/indra/newview/app_settings/static_assets/d1b530a9-b4c8-aeaf-9300-9b9d30c715d1.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL F CREATE 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 3607ade8-59a0-f44b-413a-018d50505a25 diff --git a/indra/newview/app_settings/static_assets/d26fbcbc-1985-92ef-0cf0-7148b7ed0c08.gesture b/indra/newview/app_settings/static_assets/d26fbcbc-1985-92ef-0cf0-7148b7ed0c08.gesture new file mode 100644 index 0000000000..7912966d1b Binary files /dev/null and b/indra/newview/app_settings/static_assets/d26fbcbc-1985-92ef-0cf0-7148b7ed0c08.gesture differ diff --git a/indra/newview/app_settings/static_assets/d2f2ee58-8ad1-06c9-d8d3-3827ba31567a.animatn b/indra/newview/app_settings/static_assets/d2f2ee58-8ad1-06c9-d8d3-3827ba31567a.animatn new file mode 100644 index 0000000000..89718e372e Binary files /dev/null and b/indra/newview/app_settings/static_assets/d2f2ee58-8ad1-06c9-d8d3-3827ba31567a.animatn differ diff --git a/indra/newview/app_settings/static_assets/d40491cc-3629-a090-d11f-ee947d9125a8.bodypart b/indra/newview/app_settings/static_assets/d40491cc-3629-a090-d11f-ee947d9125a8.bodypart new file mode 100644 index 0000000000..add7c05788 --- /dev/null +++ b/indra/newview/app_settings/static_assets/d40491cc-3629-a090-d11f-ee947d9125a8.bodypart @@ -0,0 +1,63 @@ +LLWearable version 22 +RASL F PLAY EYEBROWSHAPER + + 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 2 +parameters 39 +16 1.18 +31 .5 +112 0 +113 0 +114 0 +115 0 +119 0 +130 0 +131 0 +132 0 +133 0 +134 0 +135 0 +136 0 +137 .5 +140 0 +141 0 +142 0 +143 -4 +166 0 +167 0 +168 0 +169 0 +177 0 +181 -1 +182 -1 +183 -1 +184 0 +192 0 +674 -1 +750 0 +752 .5 +754 .5 +755 0 +757 -.4 +762 0 +763 0 +785 0 +789 0 +textures 1 +4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b diff --git a/indra/newview/app_settings/static_assets/d53b27ad-73b9-8ea4-0896-7890b57dd8ed.clothing b/indra/newview/app_settings/static_assets/d53b27ad-73b9-8ea4-0896-7890b57dd8ed.clothing new file mode 100644 index 0000000000..8e0a79ce72 --- /dev/null +++ b/indra/newview/app_settings/static_assets/d53b27ad-73b9-8ea4-0896-7890b57dd8ed.clothing @@ -0,0 +1,33 @@ +LLWearable version 22 +RASL M EXPLORE TANK DOWN (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 5 +parameters 9 +625 0 +638 0 +806 1 +807 1 +808 1 +814 1 +815 .99 +816 .05 +869 0 +textures 1 +2 87eb957f-4152-8e94-df39-644e5d94f7b5 diff --git a/indra/newview/app_settings/static_assets/d60c41d2-7c24-7074-d3fa-6101cea22a51.animatn b/indra/newview/app_settings/static_assets/d60c41d2-7c24-7074-d3fa-6101cea22a51.animatn new file mode 100644 index 0000000000..6626797614 Binary files /dev/null and b/indra/newview/app_settings/static_assets/d60c41d2-7c24-7074-d3fa-6101cea22a51.animatn differ diff --git a/indra/newview/app_settings/static_assets/d6c00693-90e0-cbbd-cd3d-3a6ccd510f14.clothing b/indra/newview/app_settings/static_assets/d6c00693-90e0-cbbd-cd3d-3a6ccd510f14.clothing new file mode 100644 index 0000000000..6b0616c6b4 --- /dev/null +++ b/indra/newview/app_settings/static_assets/d6c00693-90e0-cbbd-cd3d-3a6ccd510f14.clothing @@ -0,0 +1,29 @@ +LLWearable version 22 +RASL M EXPLORE 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 7a97cedf-bf46-819c-ca67-d333efd8891d diff --git a/indra/newview/app_settings/static_assets/d83fa0e5-97ed-7eb2-e798-7bd006215cb4.animatn b/indra/newview/app_settings/static_assets/d83fa0e5-97ed-7eb2-e798-7bd006215cb4.animatn new file mode 100644 index 0000000000..778a01a412 Binary files /dev/null and b/indra/newview/app_settings/static_assets/d83fa0e5-97ed-7eb2-e798-7bd006215cb4.animatn differ diff --git a/indra/newview/app_settings/static_assets/d918a0d8-7291-ce83-762f-3f68dcc7402d.gesture b/indra/newview/app_settings/static_assets/d918a0d8-7291-ce83-762f-3f68dcc7402d.gesture new file mode 100644 index 0000000000..0d1f775f6a Binary files /dev/null and b/indra/newview/app_settings/static_assets/d918a0d8-7291-ce83-762f-3f68dcc7402d.gesture differ diff --git a/indra/newview/app_settings/static_assets/d973aaf2-ff8d-3b05-8c81-48305210b3bf.clothing b/indra/newview/app_settings/static_assets/d973aaf2-ff8d-3b05-8c81-48305210b3bf.clothing new file mode 100644 index 0000000000..78eeffe6e6 --- /dev/null +++ b/indra/newview/app_settings/static_assets/d973aaf2-ff8d-3b05-8c81-48305210b3bf.clothing @@ -0,0 +1,33 @@ +LLWearable version 22 +RASL F LEARN SKIRT (TARTEN) + + 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 e95c407d-f87c-6498-25b4-b885084eb2ba diff --git a/indra/newview/app_settings/static_assets/db84829b-462c-ee83-1e27-9bbee66bd624.animatn b/indra/newview/app_settings/static_assets/db84829b-462c-ee83-1e27-9bbee66bd624.animatn new file mode 100644 index 0000000000..637a58c9bc Binary files /dev/null and b/indra/newview/app_settings/static_assets/db84829b-462c-ee83-1e27-9bbee66bd624.animatn differ diff --git a/indra/newview/app_settings/static_assets/dbd054f1-132b-cc22-e46a-bad83c230c91.gesture b/indra/newview/app_settings/static_assets/dbd054f1-132b-cc22-e46a-bad83c230c91.gesture new file mode 100644 index 0000000000..321ee082a7 Binary files /dev/null and b/indra/newview/app_settings/static_assets/dbd054f1-132b-cc22-e46a-bad83c230c91.gesture differ diff --git a/indra/newview/app_settings/static_assets/ddcd68c1-0cb9-4b32-a475-f2b9b96ec8d5.clothing b/indra/newview/app_settings/static_assets/ddcd68c1-0cb9-4b32-a475-f2b9b96ec8d5.clothing new file mode 100644 index 0000000000..470e3f53a9 --- /dev/null +++ b/indra/newview/app_settings/static_assets/ddcd68c1-0cb9-4b32-a475-f2b9b96ec8d5.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL M EXPLORE UNDER JACKET LEATHER + + 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 .66 +607 1 +608 1 +609 1 +780 1 +834 1 +835 1 +836 1 +877 0 +textures 2 +13 c9280333-0ae0-3d41-3549-b3c7d28fa6a4 +14 85b13d86-3e95-8d4b-a03b-c9c737631194 diff --git a/indra/newview/app_settings/static_assets/df074f93-968a-2588-8ef5-7db3b21dff6d.bodypart b/indra/newview/app_settings/static_assets/df074f93-968a-2588-8ef5-7db3b21dff6d.bodypart new file mode 100644 index 0000000000..2701f7709e --- /dev/null +++ b/indra/newview/app_settings/static_assets/df074f93-968a-2588-8ef5-7db3b21dff6d.bodypart @@ -0,0 +1,26 @@ +LLWearable version 22 +RASL EYES MUTED GREEN + + permissions 0 + { + base_mask 00082000 + owner_mask 00082000 + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00082000 + creator_id df110c10-72e6-40d6-8916-14b4b0366b18 + owner_id 79908808-d272-49a8-864a-d133a10931e9 + 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 .61 +99 0 +textures 1 +3 e88d1151-f2ab-6bd3-110d-6c827ccbd4a6 diff --git a/indra/newview/app_settings/static_assets/e04d450d-fdb5-0432-fd68-818aaf5935f8.animatn b/indra/newview/app_settings/static_assets/e04d450d-fdb5-0432-fd68-818aaf5935f8.animatn new file mode 100644 index 0000000000..866aaf38aa Binary files /dev/null and b/indra/newview/app_settings/static_assets/e04d450d-fdb5-0432-fd68-818aaf5935f8.animatn differ diff --git a/indra/newview/app_settings/static_assets/e2efe57f-70e8-35e5-b92c-280e3e9c6e1f.clothing b/indra/newview/app_settings/static_assets/e2efe57f-70e8-35e5-b92c-280e3e9c6e1f.clothing new file mode 100644 index 0000000000..24cbda241b --- /dev/null +++ b/indra/newview/app_settings/static_assets/e2efe57f-70e8-35e5-b92c-280e3e9c6e1f.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL F LOVE 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 .41 +508 -.37 +513 .19 +514 .66 +616 1 +654 .38 +812 1 +813 1 +817 1 +textures 1 +7 3ab7e2fa-9572-ef36-1a30-d855dbea4f92 diff --git a/indra/newview/app_settings/static_assets/e4485e5d-6bcc-e5ca-96fd-303227e93d6c.gesture b/indra/newview/app_settings/static_assets/e4485e5d-6bcc-e5ca-96fd-303227e93d6c.gesture new file mode 100644 index 0000000000..68f8555434 Binary files /dev/null and b/indra/newview/app_settings/static_assets/e4485e5d-6bcc-e5ca-96fd-303227e93d6c.gesture differ diff --git a/indra/newview/app_settings/static_assets/e5c8f3c2-9e65-5c4b-03c4-d8205f626b37.bodypart b/indra/newview/app_settings/static_assets/e5c8f3c2-9e65-5c4b-03c4-d8205f626b37.bodypart new file mode 100644 index 0000000000..251ea6e740 --- /dev/null +++ b/indra/newview/app_settings/static_assets/e5c8f3c2-9e65-5c4b-03c4-d8205f626b37.bodypart @@ -0,0 +1,26 @@ +LLWearable version 22 +RASL - Eyes - Dark Blue + + permissions 0 + { + base_mask 7fffffff + owner_mask 7fffffff + group_mask 00000000 + everyone_mask 00000000 + next_owner_mask 00082000 + creator_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + owner_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + last_owner_id ef5ac61a-72b0-48a6-843f-adb506d7ba86 + 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 9b1c0ff8-42e6-46b1-2f90-a03e4df16030 diff --git a/indra/newview/app_settings/static_assets/e7135c15-a7bc-637e-2664-b6fbdc22428c.gesture b/indra/newview/app_settings/static_assets/e7135c15-a7bc-637e-2664-b6fbdc22428c.gesture new file mode 100644 index 0000000000..01b050c192 Binary files /dev/null and b/indra/newview/app_settings/static_assets/e7135c15-a7bc-637e-2664-b6fbdc22428c.gesture differ diff --git a/indra/newview/app_settings/static_assets/e7263f17-46cf-5deb-7e5a-ecc0776f5241.clothing b/indra/newview/app_settings/static_assets/e7263f17-46cf-5deb-7e5a-ecc0776f5241.clothing new file mode 100644 index 0000000000..9a72103815 --- /dev/null +++ b/indra/newview/app_settings/static_assets/e7263f17-46cf-5deb-7e5a-ecc0776f5241.clothing @@ -0,0 +1,34 @@ +LLWearable version 22 +RASL F SHOP 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 58ff5b15-2394-eaf7-0c74-14b087a6472f +14 9ed6836d-b34b-874d-11cd-2642e80cdee4 diff --git a/indra/newview/app_settings/static_assets/e7584536-86f2-c962-405d-d14adff71f38.gesture b/indra/newview/app_settings/static_assets/e7584536-86f2-c962-405d-d14adff71f38.gesture new file mode 100644 index 0000000000..01bc3d91d2 Binary files /dev/null and b/indra/newview/app_settings/static_assets/e7584536-86f2-c962-405d-d14adff71f38.gesture differ diff --git a/indra/newview/app_settings/static_assets/ea633413-8006-180a-c3ba-96dd1d756720.animatn b/indra/newview/app_settings/static_assets/ea633413-8006-180a-c3ba-96dd1d756720.animatn new file mode 100644 index 0000000000..b398a7e1f9 Binary files /dev/null and b/indra/newview/app_settings/static_assets/ea633413-8006-180a-c3ba-96dd1d756720.animatn differ diff --git a/indra/newview/app_settings/static_assets/ea9ab69b-c2c7-3e18-a50b-37a9cfe457cd.gesture b/indra/newview/app_settings/static_assets/ea9ab69b-c2c7-3e18-a50b-37a9cfe457cd.gesture new file mode 100644 index 0000000000..c723ee8732 Binary files /dev/null and b/indra/newview/app_settings/static_assets/ea9ab69b-c2c7-3e18-a50b-37a9cfe457cd.gesture differ diff --git a/indra/newview/app_settings/static_assets/eae8905b-271a-99e2-4c0e-31106afd100c.animatn b/indra/newview/app_settings/static_assets/eae8905b-271a-99e2-4c0e-31106afd100c.animatn new file mode 100644 index 0000000000..33c8c57e7b Binary files /dev/null and b/indra/newview/app_settings/static_assets/eae8905b-271a-99e2-4c0e-31106afd100c.animatn differ diff --git a/indra/newview/app_settings/static_assets/ec952cca-61ef-aa3b-2789-4d1344f016de.animatn b/indra/newview/app_settings/static_assets/ec952cca-61ef-aa3b-2789-4d1344f016de.animatn new file mode 100644 index 0000000000..c1b9190faf Binary files /dev/null and b/indra/newview/app_settings/static_assets/ec952cca-61ef-aa3b-2789-4d1344f016de.animatn differ diff --git a/indra/newview/app_settings/static_assets/eefc79be-daae-a239-8c04-890f5d23654a.animatn b/indra/newview/app_settings/static_assets/eefc79be-daae-a239-8c04-890f5d23654a.animatn new file mode 100644 index 0000000000..b289928497 Binary files /dev/null and b/indra/newview/app_settings/static_assets/eefc79be-daae-a239-8c04-890f5d23654a.animatn differ diff --git a/indra/newview/app_settings/static_assets/ef62d355-c815-4816-2474-b1acc21094a6.animatn b/indra/newview/app_settings/static_assets/ef62d355-c815-4816-2474-b1acc21094a6.animatn new file mode 100644 index 0000000000..afc8018690 Binary files /dev/null and b/indra/newview/app_settings/static_assets/ef62d355-c815-4816-2474-b1acc21094a6.animatn differ diff --git a/indra/newview/app_settings/static_assets/efdc1727-8b8a-c800-4077-975fc27ee2f2.animatn b/indra/newview/app_settings/static_assets/efdc1727-8b8a-c800-4077-975fc27ee2f2.animatn new file mode 100644 index 0000000000..796bf8462c Binary files /dev/null and b/indra/newview/app_settings/static_assets/efdc1727-8b8a-c800-4077-975fc27ee2f2.animatn differ diff --git a/indra/newview/app_settings/static_assets/f061723d-0a18-754f-66ee-29a44795a32f.animatn b/indra/newview/app_settings/static_assets/f061723d-0a18-754f-66ee-29a44795a32f.animatn new file mode 100644 index 0000000000..e4ae54b576 Binary files /dev/null and b/indra/newview/app_settings/static_assets/f061723d-0a18-754f-66ee-29a44795a32f.animatn differ diff --git a/indra/newview/app_settings/static_assets/f22fed8b-a5ed-2c93-64d5-bdd8b93c889f.animatn b/indra/newview/app_settings/static_assets/f22fed8b-a5ed-2c93-64d5-bdd8b93c889f.animatn new file mode 100644 index 0000000000..a91d7eadc9 Binary files /dev/null and b/indra/newview/app_settings/static_assets/f22fed8b-a5ed-2c93-64d5-bdd8b93c889f.animatn differ diff --git a/indra/newview/app_settings/static_assets/f2483d55-bc31-38c0-65b2-9f7e87fce5c4.gesture b/indra/newview/app_settings/static_assets/f2483d55-bc31-38c0-65b2-9f7e87fce5c4.gesture new file mode 100644 index 0000000000..5ef31e06ca Binary files /dev/null and b/indra/newview/app_settings/static_assets/f2483d55-bc31-38c0-65b2-9f7e87fce5c4.gesture differ diff --git a/indra/newview/app_settings/static_assets/f2bed5f9-9d44-39af-b0cd-257b2a17fe40.animatn b/indra/newview/app_settings/static_assets/f2bed5f9-9d44-39af-b0cd-257b2a17fe40.animatn new file mode 100644 index 0000000000..563bc436f2 Binary files /dev/null and b/indra/newview/app_settings/static_assets/f2bed5f9-9d44-39af-b0cd-257b2a17fe40.animatn differ diff --git a/indra/newview/app_settings/static_assets/f3061aa3-0069-96b4-67b5-e16633a2ef30.clothing b/indra/newview/app_settings/static_assets/f3061aa3-0069-96b4-67b5-e16633a2ef30.clothing new file mode 100644 index 0000000000..fc1ac9f111 --- /dev/null +++ b/indra/newview/app_settings/static_assets/f3061aa3-0069-96b4-67b5-e16633a2ef30.clothing @@ -0,0 +1,28 @@ +LLWearable version 22 +RASL SOCKS TEAL + + 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 a900a787-09cc-8d9b-baaa-d93f4c9074fa diff --git a/indra/newview/app_settings/static_assets/f3300ad9-3462-1d07-2044-0fef80062da0.animatn b/indra/newview/app_settings/static_assets/f3300ad9-3462-1d07-2044-0fef80062da0.animatn new file mode 100644 index 0000000000..895b627163 Binary files /dev/null and b/indra/newview/app_settings/static_assets/f3300ad9-3462-1d07-2044-0fef80062da0.animatn differ diff --git a/indra/newview/app_settings/static_assets/f4714624-bdc5-f596-5c6f-789b438becf9.bodypart b/indra/newview/app_settings/static_assets/f4714624-bdc5-f596-5c6f-789b438becf9.bodypart new file mode 100644 index 0000000000..c8921aba5f --- /dev/null +++ b/indra/newview/app_settings/static_assets/f4714624-bdc5-f596-5c6f-789b438becf9.bodypart @@ -0,0 +1,105 @@ +LLWearable version 22 +RASL M EXPLORE SHAPE (LOUIS) + + 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 .55 +2 -.31 +4 .23 +5 -.05 +6 .09 +7 -.28 +8 -.08 +10 .57 +11 .04 +12 .1 +13 .03 +14 .38 +15 -.18 +17 .09 +18 .5 +19 -.32 +20 -.26 +21 .17 +22 .27 +23 -.02 +24 .18 +25 .53 +27 .25 +33 1.14 +34 -.22 +35 .11 +36 -.42 +37 -.14 +38 -.08 +80 1 +105 .5 +155 -.48 +157 .03 +185 -.86 +193 .6 +196 -.98 +505 .67 +506 .08 +507 0 +515 -1 +517 -.05 +518 -.12 +629 .41 +637 .05 +646 .08 +647 .17 +649 .5 +650 0 +652 .49 +653 .8 +656 0 +659 .6 +662 .5 +663 0 +664 0 +665 .08 +675 -.13 +676 .02 +678 .46 +682 .6 +683 -.08 +684 0 +685 .01 +690 .4 +692 .12 +693 .02 +753 .83 +756 -.72 +758 -.63 +759 .38 +760 .5 +764 .84 +765 -.02 +769 .45 +773 .53 +795 .31 +796 .11 +799 .58 +841 .02 +842 -.28 +879 .32 +880 -.6 +textures 0 diff --git a/indra/newview/app_settings/static_assets/f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57.animatn b/indra/newview/app_settings/static_assets/f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57.animatn new file mode 100644 index 0000000000..eae1310b21 Binary files /dev/null and b/indra/newview/app_settings/static_assets/f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57.animatn differ diff --git a/indra/newview/app_settings/static_assets/f5fc7433-043d-e819-8298-f519a119b688.animatn b/indra/newview/app_settings/static_assets/f5fc7433-043d-e819-8298-f519a119b688.animatn new file mode 100644 index 0000000000..68f791c22b Binary files /dev/null and b/indra/newview/app_settings/static_assets/f5fc7433-043d-e819-8298-f519a119b688.animatn differ diff --git a/indra/newview/app_settings/static_assets/f67a2a68-6c1d-6fc0-29fd-7ec01c0b5946.bodypart b/indra/newview/app_settings/static_assets/f67a2a68-6c1d-6fc0-29fd-7ec01c0b5946.bodypart new file mode 100644 index 0000000000..31a488725e --- /dev/null +++ b/indra/newview/app_settings/static_assets/f67a2a68-6c1d-6fc0-29fd-7ec01c0b5946.bodypart @@ -0,0 +1,52 @@ +LLWearable version 22 +RASL M PLAY SKIN (HEATH) + + 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 .3 +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 948ecc23-ea9f-229f-585a-a203d0f1d3a6 +5 2f404e84-85b9-713d-05c5-6c9bc5775dab +6 4e411a4a-4f14-630d-7915-7c0372ed723e diff --git a/indra/newview/app_settings/static_assets/f76e4009-1b0f-125f-1d81-e3d774f4a838.bodypart b/indra/newview/app_settings/static_assets/f76e4009-1b0f-125f-1d81-e3d774f4a838.bodypart new file mode 100644 index 0000000000..1fd1d91d71 --- /dev/null +++ b/indra/newview/app_settings/static_assets/f76e4009-1b0f-125f-1d81-e3d774f4a838.bodypart @@ -0,0 +1,52 @@ +LLWearable version 22 +RASL F CREATE SKIN (Poppy) + + 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 a25b31b2-1506-2529-5516-454a3a0e0824 +5 71855ea0-1773-9e70-32de-f188cc92b2dc +6 34db688d-a76d-5b69-1720-f66c004095ff diff --git a/indra/newview/app_settings/static_assets/f868fcfc-1377-396a-1635-4ac71a58a4fc.bodypart b/indra/newview/app_settings/static_assets/f868fcfc-1377-396a-1635-4ac71a58a4fc.bodypart new file mode 100644 index 0000000000..1ac799f47c --- /dev/null +++ b/indra/newview/app_settings/static_assets/f868fcfc-1377-396a-1635-4ac71a58a4fc.bodypart @@ -0,0 +1,105 @@ +LLWearable version 22 +RASL F EXPLORE SHAPE (SOFIA) + + 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 .02 +2 -.47 +4 .07 +5 -.03 +6 -.14 +7 .08 +8 -.42 +10 .57 +11 .24 +12 .04 +13 0 +14 .63 +15 -.32 +17 .19 +18 .22 +19 -.5 +20 -.14 +21 .2 +22 0 +23 -.28 +24 -.34 +25 .05 +27 -.55 +33 .71 +34 -.04 +35 -.13 +36 -1.06 +37 -.56 +38 -.22 +80 0 +105 .58 +155 -.57 +157 0 +185 -.52 +193 .52 +196 -1.1 +505 .29 +506 -.52 +507 -.63 +515 -1 +517 -.11 +518 .11 +629 .48 +637 .04 +646 -.13 +647 .03 +649 .31 +650 .15 +652 .39 +653 .32 +656 0 +659 .7 +662 .5 +663 0 +664 0 +665 .08 +675 -.17 +676 -.58 +678 .5 +682 .51 +683 -.18 +684 .2 +685 0 +690 .4 +692 .46 +693 .28 +753 .76 +756 -.4 +758 .06 +759 .73 +760 .62 +764 .1 +765 -.16 +769 .47 +773 .46 +795 .26 +796 .08 +799 .48 +841 .02 +842 .12 +879 0 +880 -.72 +textures 0 diff --git a/indra/newview/app_settings/static_assets/fa743da9-7e6e-d88e-3e4f-143dcb4fc01b.gesture b/indra/newview/app_settings/static_assets/fa743da9-7e6e-d88e-3e4f-143dcb4fc01b.gesture new file mode 100644 index 0000000000..aadded4e06 Binary files /dev/null and b/indra/newview/app_settings/static_assets/fa743da9-7e6e-d88e-3e4f-143dcb4fc01b.gesture differ diff --git a/indra/newview/app_settings/static_assets/fb262981-4295-f048-c280-629081bf3b6b.gesture b/indra/newview/app_settings/static_assets/fb262981-4295-f048-c280-629081bf3b6b.gesture new file mode 100644 index 0000000000..81be44cf09 Binary files /dev/null and b/indra/newview/app_settings/static_assets/fb262981-4295-f048-c280-629081bf3b6b.gesture differ diff --git a/indra/newview/app_settings/static_assets/fc3de4b8-bd3e-662b-934c-b72714dab5bf.gesture b/indra/newview/app_settings/static_assets/fc3de4b8-bd3e-662b-934c-b72714dab5bf.gesture new file mode 100644 index 0000000000..eca34162a8 Binary files /dev/null and b/indra/newview/app_settings/static_assets/fc3de4b8-bd3e-662b-934c-b72714dab5bf.gesture differ diff --git a/indra/newview/app_settings/static_assets/fd037134-85d4-f241-72c6-4f42164fedee.animatn b/indra/newview/app_settings/static_assets/fd037134-85d4-f241-72c6-4f42164fedee.animatn new file mode 100644 index 0000000000..eba81cff11 Binary files /dev/null and b/indra/newview/app_settings/static_assets/fd037134-85d4-f241-72c6-4f42164fedee.animatn differ diff --git a/indra/newview/app_settings/static_assets/fe63b3df-0557-c6fe-836a-a353f8108660.bodypart b/indra/newview/app_settings/static_assets/fe63b3df-0557-c6fe-836a-a353f8108660.bodypart new file mode 100644 index 0000000000..cb5b225cbf --- /dev/null +++ b/indra/newview/app_settings/static_assets/fe63b3df-0557-c6fe-836a-a353f8108660.bodypart @@ -0,0 +1,52 @@ +LLWearable version 22 +RASL F LOVE SKIN (Gena) Rev + + 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 .01 +110 .01 +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 38289ce5-6083-3349-03b1-28036d53c73e +5 f38af42a-2b43-d277-c3aa-8c4bc9409326 +6 42ec6169-874a-42a9-ca33-57230beb4450 diff --git a/indra/newview/app_settings/static_assets/ff1114e1-4063-3abe-de2f-6d13f6cae508.gesture b/indra/newview/app_settings/static_assets/ff1114e1-4063-3abe-de2f-6d13f6cae508.gesture new file mode 100644 index 0000000000..a1f155f66b Binary files /dev/null and b/indra/newview/app_settings/static_assets/ff1114e1-4063-3abe-de2f-6d13f6cae508.gesture differ diff --git a/indra/newview/app_settings/static_assets/ff201a24-6893-4c41-77f2-bf707481e585.gesture b/indra/newview/app_settings/static_assets/ff201a24-6893-4c41-77f2-bf707481e585.gesture new file mode 100644 index 0000000000..d1e8bad3bc Binary files /dev/null and b/indra/newview/app_settings/static_assets/ff201a24-6893-4c41-77f2-bf707481e585.gesture differ diff --git a/indra/newview/fsfloaterteleporthistory.cpp b/indra/newview/fsfloaterteleporthistory.cpp index f9ec067f38..c6f8004137 100644 --- a/indra/newview/fsfloaterteleporthistory.cpp +++ b/indra/newview/fsfloaterteleporthistory.cpp @@ -54,6 +54,15 @@ BOOL FSFloaterTeleportHistory::postBuild() { mHistoryPanel->setIsStandAlone(true); + mHistoryPanel->mTeleportBtn = getChild("teleport_btn"); + mHistoryPanel->mShowOnMapBtn = getChild("map_btn"); + mHistoryPanel->mShowProfile = getChild("profile_btn"); + + mHistoryPanel->mTeleportBtn->setClickedCallback(boost::bind(&LLTeleportHistoryPanel::onTeleport, mHistoryPanel)); + mHistoryPanel->mShowProfile->setClickedCallback(boost::bind(&LLTeleportHistoryPanel::onShowProfile, mHistoryPanel)); + mHistoryPanel->mShowOnMapBtn->setClickedCallback(boost::bind(&LLTeleportHistoryPanel::onShowOnMap, mHistoryPanel)); + + mFilterEditor = getChild("Filter"); if (mFilterEditor) { diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm index 55d2609212..40357123a2 100644 --- a/indra/newview/llappdelegate-objc.mm +++ b/indra/newview/llappdelegate-objc.mm @@ -70,8 +70,8 @@ // Engage BugsplatStartupManager *before* calling initViewer() to handle // any crashes during initialization. // https://www.bugsplat.com/docs/platforms/os-x#initialization - [BugsplatStartupManager sharedManager].autoSubmitCrashReport = YES; - [BugsplatStartupManager sharedManager].askUserDetails = NO; + [BugsplatStartupManager sharedManager].autoSubmitCrashReport = NO; + [BugsplatStartupManager sharedManager].askUserDetails = YES; [BugsplatStartupManager sharedManager].delegate = self; [[BugsplatStartupManager sharedManager] start]; #endif @@ -291,17 +291,18 @@ struct AttachmentInfo - (NSArray *)attachmentsForBugsplatStartupManager:(BugsplatStartupManager *)bugsplatStartupManager { - const CrashMetadata& metadata(CrashMetadata_instance()); + //const CrashMetadata& metadata(CrashMetadata_instance()); // Since we must do very similar processing for each of several file // pathnames, start by collecting them into a vector so we can iterate // instead of spelling out the logic for each. - std::vector info{ - AttachmentInfo(metadata.logFilePathname, "text/plain"), - AttachmentInfo(metadata.userSettingsPathname, "text/xml"), - AttachmentInfo(metadata.accountSettingsPathname, "text/xml"), - AttachmentInfo(metadata.staticDebugPathname, "text/xml") - }; + //std::vector info{ + // AttachmentInfo(metadata.logFilePathname, "text/plain"), + // AttachmentInfo(metadata.userSettingsPathname, "text/xml"), + // AttachmentInfo(metadata.accountSettingsPathname, "text/xml"), + // AttachmentInfo(metadata.staticDebugPathname, "text/xml") + //}; + std::vector info{}; // We "happen to know" that info[0].basename is "SecondLife.old" -- due to // the fact that BugsplatMac only notices a crash during the viewer run @@ -309,9 +310,9 @@ struct AttachmentInfo // The Bugsplat service doesn't respect the MIME type above when returning // the log data to a browser, so take this opportunity to rename the file // from .old to _log.txt - info[0].basename = - boost::filesystem::path(info[0].pathname).stem().string() + "_log.txt"; - infos("attachmentsForBugsplatStartupManager attaching log " + info[0].basename); + // info[0].basename = + // boost::filesystem::path(info[0].pathname).stem().string() + "_log.txt"; + // infos("attachmentsForBugsplatStartupManager attaching log " + info[0].basename); NSMutableArray *attachments = [[NSMutableArray alloc] init]; @@ -347,6 +348,9 @@ struct AttachmentInfo { // TODO: message string from NSError infos("Could not send crash report to BugSplat"); + NSString *pStr = [NSString stringWithFormat:@"%@", error]; +std::string bar = std::string([pStr UTF8String]); + infos(bar); } #endif // LL_BUGSPLAT diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 8b4d9452e4..14035289fe 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -4894,6 +4894,17 @@ public: } virtual void done() { + if (mComplete.size() <= 0) + { + // Ex: timeout + LL_WARNS() << "Failed to load data. Removing observer " << LL_ENDL; + gInventory.removeObserver(this); + doOnIdleOneTime(mCallable); + + delete this; + return; + } + // What we do here is get the complete information on the // items in the requested category, and set up an observer // that will wait for that to happen. diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index c55af419d4..737a416699 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4984,8 +4984,10 @@ bool LLAppViewer::initCache() gSavedSettings.setBOOL("PurgeCacheOnNextStartup", false); LL_INFOS("AppCache") << "Scheduling texture purge, based on PurgeCache* settings." << LL_ENDL; mPurgeCache = true; - // STORM-1141 force purgeAllTextures to get called to prevent a crash here. -brad - texture_cache_mismatch = true; + // No longer needed + // // STORM-1141 force purgeAllTextures to get called to prevent a crash here. -brad + // texture_cache_mismatch = true; + // } // If the J2C has changed since the last run, clear the cache @@ -5054,7 +5056,7 @@ bool LLAppViewer::initCache() LLAppViewer::getPurgeDiskCacheThread()->start(); // FIRE-13066 - if (mPurgeTextures && !read_only) + if (!mPurgeCache && mPurgeTextures && !read_only) // no need to purge textures if we already purged the cache above { LL_INFOS("AppCache") << "Purging Texture Cache..." << LL_ENDL; LLSplashScreen::update(LLTrans::getString("StartupClearingTextureCache")); diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index 465d4a05e4..9092edb115 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -1259,7 +1259,10 @@ DWORD WINAPI purgeThread( LPVOID lpParameter ) ::FindClose( hFindHandle ); for( auto dir : vctDirs ) + { + LL_INFOS("CachePurge") << "Removing an old cache" << LL_ENDL; deleteCacheDirectory( dir ); + } return 0; } diff --git a/indra/newview/llfloatercreatelandmark.cpp b/indra/newview/llfloatercreatelandmark.cpp index eb93a6a75a..8f2fdc4e89 100644 --- a/indra/newview/llfloatercreatelandmark.cpp +++ b/indra/newview/llfloatercreatelandmark.cpp @@ -160,16 +160,9 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id) mFolderCombo->removeall(); // Put the "My Favorites" folder first in list. - LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE); - LLViewerInventoryCategory* favorites_cat = gInventory.getCategory(favorites_id); - if (!favorites_cat) - { - LL_WARNS() << "Cannot find the favorites folder" << LL_ENDL; - } - else - { - mFolderCombo->add(getString("favorites_bar"), favorites_cat->getUUID()); - } + // Code moved below because of: + // FIRE-31031 New Create Landmark Floater: Default to Landmarks Folder + // // Add the "Landmarks" category. const LLViewerInventoryCategory* lmcat = gInventory.getCategory(mLandmarksID); @@ -183,6 +176,19 @@ void LLFloaterCreateLandmark::populateFoldersList(const LLUUID &folder_id) mFolderCombo->add(cat_full_name, lmcat->getUUID()); } + // FIRE-31031 New Create Landmark Floater: Default to Landmarks Folder + LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE); + LLViewerInventoryCategory* favorites_cat = gInventory.getCategory(favorites_id); + if (!favorites_cat) + { + LL_WARNS() << "Cannot find the favorites folder" << LL_ENDL; + } + else + { + mFolderCombo->add(getString("favorites_bar"), favorites_cat->getUUID()); + } + // + typedef std::vector folder_vec_t; folder_vec_t folders; // Sort the folders by their full name. diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp index 701b057383..5d0d77d87e 100644 --- a/indra/newview/llfloaterinspect.cpp +++ b/indra/newview/llfloaterinspect.cpp @@ -348,6 +348,7 @@ void LLFloaterInspect::refresh() LLResMgr& res_mgr = LLResMgr::instance(); LLSelectMgr& sel_mgr = LLSelectMgr::instance(); S32 fcount = 0; + S32 fcount_visible = 0; S32 tcount = 0; S32 vcount = 0; S32 objcount = 0; @@ -383,6 +384,7 @@ void LLFloaterInspect::refresh() LLSelectNode* obj = *iter; LLSD row; std::string owner_name, creator_name; + auto vobj{obj->getObject()}; if (obj->mCreationDate == 0) { // Don't have valid information from the server, so skip this one @@ -462,12 +464,12 @@ void LLFloaterInspect::refresh() mCreatorNameCacheConnection = LLAvatarNameCache::get(idCreator, boost::bind(&LLFloaterInspect::onGetCreatorNameCallback, this)); } - row["id"] = obj->getObject()->getID(); + row["id"] = vobj->getID(); row["columns"][0]["column"] = "object_name"; row["columns"][0]["type"] = "text"; // make sure we're either at the top of the link chain // or top of the editable chain, for attachments - if(!(obj->getObject()->isRoot() || obj->getObject()->isRootEdit())) + if(!(vobj->isRoot() || vobj->isRootEdit())) { row["columns"][0]["value"] = std::string(" ") + obj->mName; } @@ -495,17 +497,17 @@ void LLFloaterInspect::refresh() row["columns"][5]["value"] = llformat("%d", timestamp); // // PoundLife - Improved Object Inspect - res_mgr.getIntegerString(format_res_string, obj->getObject()->getNumFaces()); + res_mgr.getIntegerString(format_res_string, vobj->getNumFaces()); row["columns"][6]["column"] = "facecount"; row["columns"][6]["type"] = "text"; row["columns"][6]["value"] = format_res_string; - res_mgr.getIntegerString(format_res_string, obj->getObject()->getNumVertices()); + res_mgr.getIntegerString(format_res_string, vobj->getNumVertices()); row["columns"][7]["column"] = "vertexcount"; row["columns"][7]["type"] = "text"; row["columns"][7]["value"] = format_res_string; - res_mgr.getIntegerString(format_res_string, obj->getObject()->getNumIndices() / 3); + res_mgr.getIntegerString(format_res_string, vobj->getNumIndices() / 3); row["columns"][8]["column"] = "trianglecount"; row["columns"][8]["type"] = "text"; row["columns"][8]["value"] = format_res_string; @@ -513,7 +515,7 @@ void LLFloaterInspect::refresh() // Poundlife - Get VRAM U32 texture_memory = 0; U32 vram_memory = 0; - getObjectTextureMemory(obj->getObject(), texture_memory, vram_memory); + getObjectTextureMemory(vobj, texture_memory, vram_memory); res_mgr.getIntegerString(format_res_string, texture_memory / 1024); row["columns"][9]["column"] = "tramcount"; row["columns"][9]["type"] = "text"; @@ -526,15 +528,15 @@ void LLFloaterInspect::refresh() row["columns"][11]["column"] = "facecount_sort"; row["columns"][11]["type"] = "text"; - row["columns"][11]["value"] = LLSD::Integer(obj->getObject()->getNumFaces()); + row["columns"][11]["value"] = LLSD::Integer(vobj->getNumFaces()); row["columns"][12]["column"] = "vertexcount_sort"; row["columns"][12]["type"] = "text"; - row["columns"][12]["value"] = LLSD::Integer(obj->getObject()->getNumVertices()); + row["columns"][12]["value"] = LLSD::Integer(vobj->getNumVertices()); row["columns"][13]["column"] = "trianglecount_sort"; row["columns"][13]["type"] = "text"; - row["columns"][13]["value"] = LLSD::Integer(obj->getObject()->getNumIndices() / 3); + row["columns"][13]["value"] = LLSD::Integer(vobj->getNumIndices() / 3); row["columns"][14]["column"] = "tramcount_sort"; row["columns"][14]["type"] = "text"; @@ -546,9 +548,11 @@ void LLFloaterInspect::refresh() primcount = sel_mgr.getSelection()->getObjectCount(); objcount = sel_mgr.getSelection()->getRootObjectCount(); - fcount += obj->getObject()->getNumFaces(); - tcount += obj->getObject()->getNumIndices() / 3; - vcount += obj->getObject()->getNumVertices(); + fcount += vobj->getNumFaces(); + fcount_visible += vobj->getNumVisibleFaces(); + tcount += vobj->getNumIndices() / 3; + vcount += vobj->getNumVertices(); + // PoundLife - END mObjectList->addElement(row, ADD_TOP); } @@ -613,6 +617,8 @@ void LLFloaterInspect::refresh() args["NUM_OBJECTS"] = format_res_string; res_mgr.getIntegerString(format_res_string, primcount); args["NUM_PRIMS"] = format_res_string; + res_mgr.getIntegerString(format_res_string, fcount_visible); + args["NUM_VISIBLE_FACES"] = format_res_string; res_mgr.getIntegerString(format_res_string, fcount); args["NUM_FACES"] = format_res_string; res_mgr.getIntegerString(format_res_string, vcount); diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 78ab6ae055..edd3a57595 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1142,7 +1142,7 @@ void LLFloaterModelPreview::onPhysicsUseLOD(LLUICtrl* ctrl, void* userdata) // FIRE-30963 Support pre-defined physics shapes (initially cube) // S32 which_lod = num_lods - which_mode; // sInstance->mModelPreview->setPhysicsFromLOD(which_lod); - if(which_mode >= num_lods) + if(which_mode > num_lods) { // which_mode is between the last LOD entry and file selection // so it is a preset diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index c67c7e49f1..d2715a008c 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -893,11 +893,13 @@ void show_item_original(const LLUUID& item_uuid) LLSidepanelInventory *sidepanel_inventory = LLFloaterSidePanelContainer::getPanel("inventory"); if (sidepanel_inventory) { - LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel(); - if (main_inventory) - { - main_inventory->resetFilters(); - } + // FIRE-31037: "Recent" inventory filter gets reset when using "Show Original" + //LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel(); + //if (main_inventory) + //{ + // main_inventory->resetFilters(); + //} + // reset_inventory_filter(); if (!LLFloaterReg::getTypedInstance("inventory")->isInVisibleChain()) diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index 51b79c3cc2..6409b29e00 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -3002,14 +3002,33 @@ void LLModelPreview::lookupLODModelFiles(S32 lod) S32 next_lod = (lod - 1 >= LLModel::LOD_IMPOSTOR) ? lod - 1 : LLModel::LOD_PHYSICS; std::string lod_filename = mLODFile[LLModel::LOD_HIGH]; - std::string ext = ".dae"; - std::string::size_type i = lod_filename.rfind(ext); - if (i != std::string::npos) + // BUG-230890 fix case-sensitive filename handling + // std::string ext = ".dae"; + // std::string::size_type i = lod_filename.rfind(ext); + // if (i != std::string::npos) + // { + // lod_filename.replace(i, lod_filename.size() - ext.size(), getLodSuffix(next_lod) + ext); + // } + // Note: we cannot use gDirUtilp here because the getExtension forces a tolower which would then break uppercase extensions on Linux/Mac + std::size_t offset = lod_filename.find_last_of('.'); + std::string ext = (offset == std::string::npos || offset == 0) ? "" : lod_filename.substr(offset+1); + lod_filename = gDirUtilp->getDirName(lod_filename) + gDirUtilp->getDirDelimiter() + gDirUtilp->getBaseFileName(lod_filename, true) + getLodSuffix(next_lod) + "." + ext; + std::ostringstream out; + out << "Looking for file: " << lod_filename << " for LOD " << next_lod; + LL_DEBUGS("MeshUpload") << out.str() << LL_ENDL; + if(mImporterDebug) { - lod_filename.replace(i, lod_filename.size() - ext.size(), getLodSuffix(next_lod) + ext); + LLFloaterModelPreview::addStringToLog(out, true); } + out.str(""); + // if (gDirUtilp->fileExists(lod_filename)) { + // extra logging is helpful here, so add to log tab + out << "Auto Loading LOD" << next_lod << " from " << lod_filename; + LL_INFOS() << out.str() << LL_ENDL; + LLFloaterModelPreview::addStringToLog(out, true); + // LLFloaterModelPreview* fmp = LLFloaterModelPreview::sInstance; if (fmp) { diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index c3a20f45f2..90ee359766 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -208,6 +208,13 @@ void LLLandmarksPanel::onShowOnMap() return; } + // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater + // Disable the "Map" button because loading landmark can take some time. + // During this time the button is useless. It will be enabled on callback finish + // or upon switching to other item. + mShowOnMapBtn->setEnabled(FALSE); + // + doActionOnCurSelectedLandmark(boost::bind(&LLLandmarksPanel::doShowOnMap, this, _1)); } @@ -293,6 +300,16 @@ void LLLandmarksPanel::updateVerbs() { sRemoveBtn->setEnabled(isActionEnabled("delete") && (isFolderSelected() || isLandmarkSelected())); } + + // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater + if (!isTabVisible()) + return; + + bool landmark_selected = isLandmarkSelected(); + mTeleportBtn->setEnabled(landmark_selected && isActionEnabled("teleport")); + mShowProfile->setEnabled(landmark_selected && isActionEnabled("more_info")); + mShowOnMapBtn->setEnabled(landmark_selected && isActionEnabled("show_on_map")); + // } void LLLandmarksPanel::setItemSelected(const LLUUID& obj_id, BOOL take_keyboard_focus) @@ -1071,6 +1088,7 @@ void LLLandmarksPanel::doShowOnMap(LLLandmark* landmark) LLFloaterReg::showInstance("world_map", "center"); } + mShowOnMapBtn->setEnabled(TRUE); // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater mGearLandmarkMenu->setItemEnabled("show_on_map", TRUE); } diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index de8688fc5d..d7b07dc5f8 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -307,6 +307,11 @@ BOOL LLPanelPlaces::postBuild() mOverflowBtn = getChild("overflow_btn"); mOverflowBtn->setMouseDownCallback(boost::bind(&LLPanelPlaces::onOverflowButtonClicked, this)); + // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater + mPlaceInfoBtn = getChild("profile_btn"); + mPlaceInfoBtn->setClickedCallback(boost::bind(&LLPanelPlaces::onProfileButtonClicked, this)); + // + mGearMenuButton = getChild("options_gear_btn"); mGearMenuButton->setMouseDownCallback(boost::bind(&LLPanelPlaces::onGearMenuClick, this)); @@ -355,7 +360,7 @@ BOOL LLPanelPlaces::postBuild() } mButtonsContainer = getChild("button_layout_panel"); - mButtonsContainer->setVisible(FALSE); + //mButtonsContainer->setVisible(FALSE); // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater mFilterContainer = getChild("top_menu_panel"); mFilterEditor = getChild("Filter"); @@ -963,6 +968,16 @@ void LLPanelPlaces::onOverflowButtonClicked() mOverflowBtn->setMenu(menu, LLMenuButton::MP_TOP_RIGHT); } +// FIRE-31033: Keep Teleport/Map/Profile buttons on places floater +void LLPanelPlaces::onProfileButtonClicked() +{ + if (!mActivePanel) + return; + + mActivePanel->onShowProfile(); +} +// + bool LLPanelPlaces::onOverflowMenuItemEnable(const LLSD& param) { std::string value = param.asString(); @@ -1245,6 +1260,9 @@ void LLPanelPlaces::createTabs() LLFavoritesPanel* favorites_panel = new LLFavoritesPanel(); if (favorites_panel) { + // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater + favorites_panel->setPanelPlacesButtons(this); + mTabContainer->addTabPanel( LLTabContainer::TabPanelParams(). panel(favorites_panel). @@ -1255,6 +1273,9 @@ void LLPanelPlaces::createTabs() LLLandmarksPanel* landmarks_panel = new LLLandmarksPanel(); if (landmarks_panel) { + // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater + landmarks_panel->setPanelPlacesButtons(this); + mTabContainer->addTabPanel( LLTabContainer::TabPanelParams(). panel(landmarks_panel). @@ -1265,6 +1286,9 @@ void LLPanelPlaces::createTabs() LLTeleportHistoryPanel* teleport_history_panel = new LLTeleportHistoryPanel(); if (teleport_history_panel) { + // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater + teleport_history_panel->setPanelPlacesButtons(this); + mTabContainer->addTabPanel( LLTabContainer::TabPanelParams(). panel(teleport_history_panel). @@ -1369,12 +1393,17 @@ void LLPanelPlaces::updateVerbs() mSaveBtn->setVisible(isLandmarkEditModeOn); mCancelBtn->setVisible(isLandmarkEditModeOn); mCloseBtn->setVisible(is_create_landmark_visible && !isLandmarkEditModeOn); + // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater + mPlaceInfoBtn->setVisible(!is_place_info_visible && !is_create_landmark_visible && !isLandmarkEditModeOn && !is_pick_panel_visible); bool show_options_btn = is_place_info_visible && !is_create_landmark_visible && !isLandmarkEditModeOn; mOverflowBtn->setVisible(show_options_btn); getChild("lp_options")->setVisible(show_options_btn); getChild("lp2")->setVisible(!show_options_btn); + // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater + mPlaceInfoBtn->setEnabled(!is_create_landmark_visible && !isLandmarkEditModeOn && have_3d_pos); + if (is_place_info_visible) { mShowOnMapBtn->setEnabled(have_3d_pos); diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h index 24b7605fd6..81f1c6d70e 100644 --- a/indra/newview/llpanelplaces.h +++ b/indra/newview/llpanelplaces.h @@ -104,6 +104,7 @@ private: bool onOverflowMenuItemEnable(const LLSD& param); void onCreateLandmarkButtonClicked(const LLUUID& folder_id); void onBackButtonClicked(); + void onProfileButtonClicked(); // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater void onGearMenuClick(); void onSortingMenuClick(); void onAddMenuClick(); @@ -140,6 +141,7 @@ private: LLButton* mCancelBtn; LLButton* mCloseBtn; LLMenuButton* mOverflowBtn; + LLButton* mPlaceInfoBtn; // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater // Top menu LLMenuButton* mGearMenuButton; diff --git a/indra/newview/llpanelplacestab.cpp b/indra/newview/llpanelplacestab.cpp index 1594cac817..139949a9c8 100644 --- a/indra/newview/llpanelplacestab.cpp +++ b/indra/newview/llpanelplacestab.cpp @@ -48,6 +48,15 @@ bool LLPanelPlacesTab::isTabVisible() return true; } +// FIRE-31033: Keep Teleport/Map/Profile buttons on places floater +void LLPanelPlacesTab::setPanelPlacesButtons(LLPanelPlaces* panel) +{ + mTeleportBtn = panel->getChild("teleport_btn"); + mShowOnMapBtn = panel->getChild("map_btn"); + mShowProfile = panel->getChild("profile_btn"); +} +// + void LLPanelPlacesTab::onRegionResponse(const LLVector3d& landmark_global_pos, U64 region_handle, const std::string& url, diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h index aab1c130c1..9376d1a6df 100644 --- a/indra/newview/llpanelplacestab.h +++ b/indra/newview/llpanelplacestab.h @@ -58,6 +58,7 @@ public: bool isTabVisible(); // Check if parent TabContainer is visible. + void setPanelPlacesButtons(LLPanelPlaces* panel); // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater void onRegionResponse(const LLVector3d& landmark_global_pos, U64 region_handle, const std::string& url, @@ -70,6 +71,12 @@ public: void setRemoveBtn(LLButton* trash_btn) { sRemoveBtn = trash_btn; } protected: + // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater + LLButton* mTeleportBtn; + LLButton* mShowOnMapBtn; + LLButton* mShowProfile; + // + // Search string for filtering landmarks and teleport history locations static std::string sFilterSubString; static LLButton* sRemoveBtn; diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp index 7b0cbe45e0..a5dbb5a212 100644 --- a/indra/newview/llpanelteleporthistory.cpp +++ b/indra/newview/llpanelteleporthistory.cpp @@ -661,6 +661,22 @@ void LLTeleportHistoryPanel::updateVerbs() { sRemoveBtn->setEnabled(true); } + + // FIRE-31033: Keep Teleport/Map/Profile buttons on places floater + if (!mLastSelectedFlatlList) + { + mTeleportBtn->setEnabled(false); + mShowProfile->setEnabled(false); + mShowOnMapBtn->setEnabled(false); + return; + } + + LLTeleportHistoryFlatItem* itemp = dynamic_cast (mLastSelectedFlatlList->getSelectedItem()); + + mTeleportBtn->setEnabled(NULL != itemp); + mShowProfile->setEnabled(NULL != itemp); + mShowOnMapBtn->setEnabled(NULL != itemp); + // } // virtual @@ -1235,6 +1251,12 @@ void LLTeleportHistoryPanel::onGearMenuAction(const LLSD& userdata) LLLandmarkActions::getSLURLfromPosGlobal(globalPos, boost::bind(&LLTeleportHistoryPanel::gotSLURLCallback, _1)); } + // FIRE-31025: Clear TP history doesn't work anymore + else if ("clear_history" == command_name) + { + onRemoveSelected(); + } + // } bool LLTeleportHistoryPanel::isActionEnabled(const LLSD& userdata) const diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp index d9ff1ec149..585eecf38d 100644 --- a/indra/newview/llviewerchat.cpp +++ b/indra/newview/llviewerchat.cpp @@ -66,6 +66,7 @@ void LLViewerChat::getChatColor(const LLChat& chat, LLColor4& r_color, LLSD args { switch(chat.mSourceType) { + case CHAT_SOURCE_TELEPORT: // FIRE-31034: New teleport info system message ignoring system chat color case CHAT_SOURCE_SYSTEM: r_color = LLUIColorTable::instance().getColor("SystemChatColor"); break; diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 00deddbf73..fd388b1435 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -516,6 +516,21 @@ void LLViewerObject::markDead() } } +S32 LLViewerObject::getNumVisibleFaces() const +{ + int v{0}; + if(mDrawable.notNull()) + { + for (int i = 0;i < mDrawable->getNumFaces();i++) + { + if(mDrawable->getFace(i)->getTextureEntry()->getAlpha() != 0.f) + v++; + } + } + return v; +}; + + void LLViewerObject::dump() const { LL_INFOS() << "Type: " << pCodeToString(mPrimitiveCode) << LL_ENDL; diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 07498bec2b..6b2d4ed877 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -199,6 +199,7 @@ public: virtual U32 getNumVertices() const; virtual U32 getNumIndices() const; S32 getNumFaces() const { return mNumFaces; } + S32 getNumVisibleFaces() const; // Graphical stuff for objects - maybe broken out into render class later? virtual void updateTextures(); diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index adf09bed17..18fba85be1 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -581,7 +581,8 @@ void send_viewer_stats(bool include_preferences) fail["invalid"] = (S32) gMessageSystem->mInvalidOnCircuitPackets; fail["missing_updater"] = (S32) LLAppViewer::instance()->isUpdaterMissing(); - body["ui"] = LLUIUsage::instance().asLLSD(); + // We do not need to send UI usage stats according to Jess... + //body["ui"] = LLUIUsage::instance().asLLSD(); body["stats"]["voice"] = LLVoiceVivoxStats::getInstance()->read(); diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index a46da8ef0d..0f31bb6b6e 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -259,6 +259,7 @@ LLViewerTextureList::~LLViewerTextureList() void LLViewerTextureList::shutdown() { + LL_WARNS() << "Shutdown called" << LL_ENDL; // clear out preloads mImagePreloads.clear(); diff --git a/indra/newview/skins/ansastorm/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/ansastorm/xui/en/panel_outfits_inventory.xml index aa8dbb34b4..ed7e3b6e8a 100644 --- a/indra/newview/skins/ansastorm/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/ansastorm/xui/en/panel_outfits_inventory.xml @@ -106,7 +106,7 @@