summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/CMakeLists.txt27
-rw-r--r--indra/newview/VIEWER_VERSION.txt2
-rw-r--r--indra/newview/app_settings/commands.xml11
-rw-r--r--indra/newview/app_settings/settings.xml197
-rw-r--r--indra/newview/app_settings/static_data.db2bin576578 -> 0 bytes
-rw-r--r--indra/newview/app_settings/static_index.db2bin9894 -> 0 bytes
-rw-r--r--indra/newview/llagent.cpp23
-rw-r--r--indra/newview/llagent.h6
-rw-r--r--indra/newview/llappviewer.cpp312
-rw-r--r--indra/newview/llappviewer.h12
-rw-r--r--indra/newview/llappviewerwin32.cpp2
-rw-r--r--indra/newview/llcompilequeue.cpp12
-rw-r--r--indra/newview/llcompilequeue.h2
-rw-r--r--indra/newview/lldrawpoolavatar.cpp2
-rw-r--r--indra/newview/llfilepicker.h2
-rw-r--r--indra/newview/llfloater360capture.cpp930
-rw-r--r--indra/newview/llfloater360capture.h97
-rw-r--r--indra/newview/llfloaterauction.cpp11
-rw-r--r--indra/newview/llfloaterbvhpreview.cpp5
-rw-r--r--indra/newview/llfloatermodelpreview.cpp1
-rw-r--r--indra/newview/llfloaterpreference.cpp23
-rw-r--r--indra/newview/llfloaterpreference.h7
-rw-r--r--indra/newview/llfloaterregioninfo.cpp11
-rw-r--r--indra/newview/llfloaterregioninfo.h4
-rw-r--r--indra/newview/llfloaterreporter.cpp12
-rw-r--r--indra/newview/llfloatersnapshot.cpp14
-rw-r--r--indra/newview/llfloatersnapshot.h1
-rw-r--r--indra/newview/llfloatertos.cpp2
-rw-r--r--indra/newview/llfloatertos.h1
-rw-r--r--indra/newview/llgesturemgr.cpp20
-rw-r--r--indra/newview/llgesturemgr.h11
-rw-r--r--indra/newview/lllandmarklist.cpp5
-rw-r--r--indra/newview/lllandmarklist.h1
-rw-r--r--indra/newview/llmeshrepository.cpp109
-rw-r--r--indra/newview/llmeshrepository.h1
-rw-r--r--indra/newview/lloutfitgallery.cpp2
-rw-r--r--indra/newview/lloutfitgallery.h1
-rw-r--r--indra/newview/llpostcard.cpp3
-rw-r--r--indra/newview/llpreviewgesture.cpp16
-rw-r--r--indra/newview/llpreviewgesture.h4
-rw-r--r--indra/newview/llpreviewnotecard.cpp16
-rw-r--r--indra/newview/llpreviewnotecard.h3
-rw-r--r--indra/newview/llpreviewscript.cpp30
-rw-r--r--indra/newview/llpreviewscript.h11
-rw-r--r--indra/newview/llsettingsvo.cpp10
-rw-r--r--indra/newview/llsettingsvo.h3
-rw-r--r--indra/newview/llsnapshotlivepreview.cpp6
-rw-r--r--indra/newview/llstartup.cpp16
-rw-r--r--indra/newview/lltexturecache.cpp46
-rw-r--r--indra/newview/llviewerassetstorage.cpp53
-rw-r--r--indra/newview/llviewerassetstorage.h8
-rw-r--r--indra/newview/llviewerassetupload.cpp23
-rw-r--r--indra/newview/llviewerassetupload.h2
-rw-r--r--indra/newview/llviewercontrol.cpp23
-rw-r--r--indra/newview/llviewerfloaterreg.cpp2
-rw-r--r--indra/newview/llviewermedia.cpp36
-rw-r--r--indra/newview/llviewermedia.h1
-rw-r--r--indra/newview/llviewermedia_streamingaudio.cpp2
-rw-r--r--indra/newview/llviewermenu.cpp49
-rw-r--r--indra/newview/llviewermenufile.cpp2
-rw-r--r--indra/newview/llviewermessage.cpp18
-rw-r--r--indra/newview/llviewermessage.h4
-rw-r--r--indra/newview/llviewerobject.cpp1
-rw-r--r--indra/newview/llviewerprecompiledheaders.h1
-rw-r--r--indra/newview/llviewerregion.cpp2
-rw-r--r--indra/newview/llviewerstats.cpp3
-rw-r--r--indra/newview/llviewerstats.h1
-rw-r--r--indra/newview/llviewertexlayer.cpp2
-rw-r--r--indra/newview/llviewertexture.cpp2
-rw-r--r--indra/newview/llviewertexture.h2
-rw-r--r--indra/newview/llviewertexturelist.cpp4
-rw-r--r--indra/newview/llviewerwearable.cpp1
-rw-r--r--indra/newview/llviewerwindow.cpp98
-rw-r--r--indra/newview/llviewerwindow.h5
-rw-r--r--indra/newview/llvoavatar.cpp1
-rw-r--r--indra/newview/llvovolume.h7
-rw-r--r--indra/newview/skins/default/html/common/equirectangular/default.html22
-rw-r--r--indra/newview/skins/default/html/common/equirectangular/eqr_gen.html150
-rw-r--r--indra/newview/skins/default/textures/textures.xml3
-rw-r--r--indra/newview/skins/default/textures/toolbar_icons/360_capture.pngbin0 -> 793 bytes
-rw-r--r--indra/newview/skins/default/xui/da/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/da/strings.xml3
-rw-r--r--indra/newview/skins/default/xui/de/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/de/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/de/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_360capture.xml135
-rw-r--r--indra/newview/skins/default/xui/en/floater_preferences.xml6
-rw-r--r--indra/newview/skins/default/xui/en/floater_scene_load_stats.xml6
-rw-r--r--indra/newview/skins/default/xui/en/floater_snapshot.xml22
-rw-r--r--indra/newview/skins/default/xui/en/floater_stats.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_toybox.xml12
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml17
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml24
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml9
-rw-r--r--indra/newview/skins/default/xui/es/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/es/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/es/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/fr/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/fr/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/it/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/it/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/it/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/ja/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/ja/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/pl/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/pl/strings.xml3
-rw-r--r--indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/pt/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/pt/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/ru/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/ru/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/tr/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/tr/strings.xml4
-rw-r--r--indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/zh/floater_stats.xml1
-rw-r--r--indra/newview/skins/default/xui/zh/strings.xml4
-rwxr-xr-xindra/newview/viewer_manifest.py19
122 files changed, 2113 insertions, 775 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 5567b9cc56..88808bede2 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -12,12 +12,14 @@ include(bugsplat)
include(BuildPackagesInfo)
include(BuildVersion)
include(CMakeCopyIfDifferent)
+include(CubemapToEquirectangularJS)
include(DBusGlib)
include(DragDrop)
include(EXPAT)
include(FMODSTUDIO)
include(GLOD)
include(Hunspell)
+include(JPEGEncoderBasic)
include(JsonCpp)
include(LLAppearance)
include(LLAudio)
@@ -37,7 +39,7 @@ include(LLPlugin)
include(LLPrimitive)
include(LLRender)
include(LLUI)
-include(LLVFS)
+include(LLFileSystem)
include(LLWindow)
include(LLXML)
include(NDOF)
@@ -47,6 +49,7 @@ include(OpenGL)
include(OpenSSL)
include(PNG)
include(TemplateCheck)
+include(ThreeJS)
include(UI)
include(UnixInstall)
include(ViewerMiscLibs)
@@ -82,7 +85,7 @@ include_directories(
${LLPRIMITIVE_INCLUDE_DIRS}
${LLRENDER_INCLUDE_DIRS}
${LLUI_INCLUDE_DIRS}
- ${LLVFS_INCLUDE_DIRS}
+ ${LLFILESYSTEM_INCLUDE_DIRS}
${LLWINDOW_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
${LLLOGIN_INCLUDE_DIRS}
@@ -205,6 +208,7 @@ set(viewer_SOURCE_FILES
llfilteredwearablelist.cpp
llfirstuse.cpp
llflexibleobject.cpp
+ llfloater360capture.cpp
llfloaterabout.cpp
llfloaterbvhpreview.cpp
llfloateraddpaymentmethod.cpp
@@ -278,7 +282,7 @@ set(viewer_SOURCE_FILES
llfloaternamedesc.cpp
llfloaternotificationsconsole.cpp
llfloaternotificationstabbed.cpp
- llfloateroutfitphotopreview.cpp
+ llfloateroutfitphotopreview.cpp
llfloateroutfitsnapshot.cpp
llfloaterobjectweights.cpp
llfloateropenobject.cpp
@@ -844,6 +848,7 @@ set(viewer_HEADER_FILES
llfilteredwearablelist.h
llfirstuse.h
llflexibleobject.h
+ llfloater360capture.h
llfloaterabout.h
llfloaterbvhpreview.h
llfloateraddpaymentmethod.h
@@ -1381,7 +1386,7 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt"
"${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\n")
set_source_files_properties(
- llversioninfo.cpp tests/llversioninfo_test.cpp
+ llversioninfo.cpp tests/llversioninfo_test.cpp
PROPERTIES
COMPILE_DEFINITIONS "${VIEWER_CHANNEL_VERSION_DEFINES}" # see BuildVersion.cmake
)
@@ -1998,7 +2003,7 @@ endif (WINDOWS)
# one of these being libz where you can find four or more versions in play
# at once. On Linux, libz can be found at link and run time via a number
# of paths:
-#
+#
# => -lfreetype
# => libz.so.1 (on install machine, not build)
# => -lSDL
@@ -2029,7 +2034,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${LLRENDER_LIBRARIES}
${FREETYPE_LIBRARIES}
${LLUI_LIBRARIES}
- ${LLVFS_LIBRARIES}
+ ${LLFILESYSTEM_LIBRARIES}
${LLWINDOW_LIBRARIES}
${LLXML_LIBRARIES}
${LLMATH_LIBRARIES}
@@ -2169,7 +2174,7 @@ if (DARWIN)
# https://blog.kitware.com/upcoming-in-cmake-2-8-12-osx-rpath-support/
set(CMAKE_MACOSX_RPATH 1)
-
+
set_target_properties(
${VIEWER_BINARY_NAME}
PROPERTIES
@@ -2371,7 +2376,7 @@ if (LL_TESTS)
llworldmap.cpp
llworldmipmap.cpp
PROPERTIES
- LL_TEST_ADDITIONAL_SOURCE_FILES
+ LL_TEST_ADDITIONAL_SOURCE_FILES
tests/llviewertexture_stub.cpp
#llviewertexturelist.cpp
)
@@ -2405,7 +2410,7 @@ if (LL_TESTS)
llworldmap.cpp
llworldmipmap.cpp
PROPERTIES
- LL_TEST_ADDITIONAL_SOURCE_FILES
+ LL_TEST_ADDITIONAL_SOURCE_FILES
tests/llviewertexture_stub.cpp
#llviewertexturelist.cpp
LL_TEST_ADDITIONAL_LIBRARIES "${BOOST_SYSTEM_LIBRARY}"
@@ -2452,7 +2457,7 @@ if (LL_TESTS)
set(test_libs
${LLMESSAGE_LIBRARIES}
${WINDOWS_LIBRARIES}
- ${LLVFS_LIBRARIES}
+ ${LLFILESYSTEM_LIBRARIES}
${LLMATH_LIBRARIES}
${LLCOMMON_LIBRARIES}
${GOOGLEMOCK_LIBRARIES}
@@ -2467,7 +2472,7 @@ if (LL_TESTS)
set(test_libs
${WINDOWS_LIBRARIES}
- ${LLVFS_LIBRARIES}
+ ${LLFILESYSTEM_LIBRARIES}
${LLMATH_LIBRARIES}
${LLCOMMON_LIBRARIES}
${LLMESSAGE_LIBRARIES}
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index a194c18e86..5e3ec53ea6 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.5.1
+6.5.2
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index d0480ca47e..3dfe3f6634 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -276,4 +276,15 @@
is_running_function="Floater.IsOpen"
is_running_parameters="my_environments"
/>
+ <command name="360capture"
+ available_in_toybox="true"
+ is_flashing_allowed="true"
+ icon="Command_360_Capture_Icon"
+ label_ref="Command_360_Capture_Label"
+ tooltip_ref="Command_360_Capture_Tooltip"
+ execute_function="Floater.ToggleOrBringToFront"
+ execute_parameters="360capture"
+ is_running_function="Floater.IsOpen"
+ is_running_parameters="360capture"
+ />
</commands>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index eeb7e6f0aa..12f435f931 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1362,6 +1362,39 @@
<key>Value</key>
<integer>23</integer>
</map>
+ <key>EnableDiskCacheDebugInfo</key>
+ <map>
+ <key>Comment</key>
+ <string>When set, display additional cache debugging information</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>DiskCachePercentOfTotal</key>
+ <map>
+ <key>Comment</key>
+ <string>The percent of total cache size (defined by CacheSize) to use for the disk cache</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>20.0</real>
+ </map>
+ <key>DiskCacheDirName</key>
+ <map>
+ <key>Comment</key>
+ <string>The name of the disk cache (within the standard Viewer disk cache directory)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>cache</string>
+ </map>
<key>CacheLocation</key>
<map>
<key>Comment</key>
@@ -2077,6 +2110,28 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>BrowserFileAccessFromFileUrls</key>
+ <map>
+ <key>Comment</key>
+ <string>Allow access to local files via file urls in the embedded browser</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>BrowserPluginsEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string>Enable Web plugins in the built-in Web browser?</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>ChatBarCustomWidth</key>
<map>
<key>Comment</key>
@@ -2826,17 +2881,6 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeVFSPendingOps</key>
- <map>
- <key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>-1</integer>
- </map>
<key>DebugStatModeTimeDialation</key>
<map>
<key>Comment</key>
@@ -3541,7 +3585,7 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>DoubleClickTeleport</key>
+ <key>DoubleClickTeleport</key>
<map>
<key>Comment</key>
<string>Enable double-click to teleport where allowed (afects minimap and people panel)</string>
@@ -3629,17 +3673,6 @@
<key>Value</key>
<integer>4</integer>
</map>
- <key>DumpVFSCaches</key>
- <map>
- <key>Comment</key>
- <string>Dump VFS caches on startup.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>DynamicCameraStrength</key>
<map>
<key>Comment</key>
@@ -8873,7 +8906,7 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>RenderHiDPI</key>
+ <key>RenderHiDPI</key>
<map>
<key>Comment</key>
<string>Enable support for HiDPI displays, like Retina (MacOS X ONLY, requires restart)</string>
@@ -11595,7 +11628,7 @@
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
- </map>
+ </map>
<key>NearbyListShowMap</key>
<map>
<key>Comment</key>
@@ -14285,28 +14318,6 @@
<key>Value</key>
<string/>
</map>
- <key>VFSOldSize</key>
- <map>
- <key>Comment</key>
- <string>[DO NOT MODIFY] Controls resizing of local file cache</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>VFSSalt</key>
- <map>
- <key>Comment</key>
- <string>[DO NOT MODIFY] Controls local file caching behavior</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>VelocityInterpolate</key>
<map>
<key>Comment</key>
@@ -16681,9 +16692,95 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>1</integer>
+ </map>
+ <key>360CaptureUseInterestListCap</key>
+ <map>
+ <key>Comment</key>
+ <string>Flag if set, uses the new InterestList cap to ask the simulator for full content</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>360CaptureJPEGEncodeQuality</key>
+ <map>
+ <key>Comment</key>
+ <string>Quality value to use in the JPEG encoder (0..100)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>95</integer>
+ </map>
+ <key>360CaptureDebugSaveImage</key>
+ <map>
+ <key>Comment</key>
+ <string>Flag if set, saves off each cube map as an image, as well as the JavaScript data URL, for debugging purposes</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>360CaptureOutputImageWidth</key>
+ <map>
+ <key>Comment</key>
+ <string>Width of the output 360 equirectangular image</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>4096</integer>
+ </map>
+ <key>360CaptureHideAvatars</key>
+ <map>
+ <key>Comment</key>
+ <string>Flag if set, removes all the avatars from the 360 snapshot</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
</map>
+ <key>360CaptureCameraFOV</key>
+ <map>
+ <key>Comment</key>
+ <string>Field of view of the WebGL camera that converts the cubemap to an equirectangular image</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>75</integer>
+ </map>
+ <key>360CaptureNumRenderPasses</key>
+ <map>
+ <key>Comment</key>
+ <string>Number of times to render the scene while taking a snapshot</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>3</integer>
+ </map>
+ <key>ResetUIScaleOnFirstRun</key>
+ <map>
+ <key>Comment</key>
+ <string>Resets the UI scale factor on first run due to changed display scaling behavior</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
</map>
</llsd>
-
-
diff --git a/indra/newview/app_settings/static_data.db2 b/indra/newview/app_settings/static_data.db2
deleted file mode 100644
index f85aa81601..0000000000
--- a/indra/newview/app_settings/static_data.db2
+++ /dev/null
Binary files differ
diff --git a/indra/newview/app_settings/static_index.db2 b/indra/newview/app_settings/static_index.db2
deleted file mode 100644
index a5440f96f2..0000000000
--- a/indra/newview/app_settings/static_index.db2
+++ /dev/null
Binary files differ
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 4ef9c10de2..daab725ce6 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -2922,7 +2922,7 @@ bool LLAgent::requestGetCapability(const std::string &capName, httpCallback_t cb
{
std::string url;
- url = getRegion()->getCapability(capName);
+ url = getRegionCapability(capName);
if (url.empty())
{
@@ -4663,23 +4663,19 @@ void LLAgent::requestAgentUserInfoCoro(std::string capurl)
return;
}
- bool im_via_email;
- bool is_verified_email;
std::string email;
std::string dir_visibility;
- im_via_email = result["im_via_email"].asBoolean();
- is_verified_email = result["is_verified"].asBoolean();
email = result["email"].asString();
dir_visibility = result["directory_visibility"].asString();
// TODO: This should probably be changed. I'm not entirely comfortable
// having LLAgent interact directly with the UI in this way.
- LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email, is_verified_email);
+ LLFloaterPreference::updateUserInfo(dir_visibility);
LLFloaterSnapshot::setAgentEmail(email);
}
-void LLAgent::sendAgentUpdateUserInfo(bool im_via_email, const std::string& directory_visibility)
+void LLAgent::sendAgentUpdateUserInfo(const std::string& directory_visibility)
{
std::string cap;
@@ -4692,16 +4688,16 @@ void LLAgent::sendAgentUpdateUserInfo(bool im_via_email, const std::string& dire
if (!cap.empty())
{
LLCoros::instance().launch("updateAgentUserInfoCoro",
- boost::bind(&LLAgent::updateAgentUserInfoCoro, this, cap, im_via_email, directory_visibility));
+ boost::bind(&LLAgent::updateAgentUserInfoCoro, this, cap, directory_visibility));
}
else
{
- sendAgentUpdateUserInfoMessage(im_via_email, directory_visibility);
+ sendAgentUpdateUserInfoMessage(directory_visibility);
}
}
-void LLAgent::updateAgentUserInfoCoro(std::string capurl, bool im_via_email, std::string directory_visibility)
+void LLAgent::updateAgentUserInfoCoro(std::string capurl, std::string directory_visibility)
{
LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
@@ -4712,8 +4708,8 @@ void LLAgent::updateAgentUserInfoCoro(std::string capurl, bool im_via_email, std
httpOpts->setFollowRedirects(true);
LLSD body(LLSDMap
- ("dir_visibility", LLSD::String(directory_visibility))
- ("im_via_email", LLSD::Boolean(im_via_email)));
+ ("dir_visibility", LLSD::String(directory_visibility)));
+
LLSD result = httpAdapter->postAndSuspend(httpRequest, capurl, body, httpOpts, httpHeaders);
@@ -4741,14 +4737,13 @@ void LLAgent::sendAgentUserInfoRequestMessage()
sendReliableMessage();
}
-void LLAgent::sendAgentUpdateUserInfoMessage(bool im_via_email, const std::string& directory_visibility)
+void LLAgent::sendAgentUpdateUserInfoMessage(const std::string& directory_visibility)
{
gMessageSystem->newMessageFast(_PREHASH_UpdateUserInfo);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, getSessionID());
gMessageSystem->nextBlockFast(_PREHASH_UserData);
- gMessageSystem->addBOOLFast(_PREHASH_IMViaEMail, im_via_email);
gMessageSystem->addString("DirectoryVisibility", directory_visibility);
gAgent.sendReliableMessage();
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 134540c6b3..498bea3c07 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -928,14 +928,14 @@ public:
void sendAgentUserInfoRequest();
// IM to Email and Online visibility
- void sendAgentUpdateUserInfo(bool im_to_email, const std::string& directory_visibility);
+ void sendAgentUpdateUserInfo(const std::string& directory_visibility);
private:
void requestAgentUserInfoCoro(std::string capurl);
- void updateAgentUserInfoCoro(std::string capurl, bool im_via_email, std::string directory_visibility);
+ void updateAgentUserInfoCoro(std::string capurl, std::string directory_visibility);
// DEPRECATED: may be removed when User Info cap propagates
void sendAgentUserInfoRequestMessage();
- void sendAgentUpdateUserInfoMessage(bool im_via_email, const std::string& directory_visibility);
+ void sendAgentUpdateUserInfoMessage(const std::string& directory_visibility);
//--------------------------------------------------------------------
// Receive
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index ff53910d74..7af574dab8 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -101,6 +101,7 @@
#include "lllogininstance.h"
#include "llprogressview.h"
#include "llvocache.h"
+#include "lldiskcache.h"
#include "llvopartgroup.h"
#include "llweb.h"
#include "llfloatertexturefetchdebugger.h"
@@ -118,8 +119,6 @@
#include "llprimitive.h"
#include "llurlaction.h"
#include "llurlentry.h"
-#include "llvfile.h"
-#include "llvfsthread.h"
#include "llvolumemgr.h"
#include "llxfermanager.h"
#include "llphysicsextensions.h"
@@ -343,9 +342,6 @@ bool gUseWireframe = FALSE;
//use for remember deferred mode in wireframe switch
bool gInitialDeferredModeForWireframe = FALSE;
-// VFS globals - see llappviewer.h
-LLVFS* gStaticVFS = NULL;
-
LLMemoryInfo gSysMemory;
U64Bytes gMemoryAllocated(0); // updated in display_stats() in llviewerdisplay.cpp
@@ -434,12 +430,6 @@ void init_default_trans_args()
default_trans_args.insert("create_account_url");
}
-//----------------------------------------------------------------------------
-// File scope definitons
-const char *VFS_DATA_FILE_BASE = "data.db2.x.";
-const char *VFS_INDEX_FILE_BASE = "index.db2.x.";
-
-
struct SettingsFile : public LLInitParam::Block<SettingsFile>
{
Mandatory<std::string> name;
@@ -608,10 +598,10 @@ static void settings_to_globals()
static void settings_modify()
{
- LLRenderTarget::sUseFBO = gSavedSettings.getBOOL("RenderDeferred");
LLPipeline::sRenderTransparentWater = gSavedSettings.getBOOL("RenderTransparentWater");
LLPipeline::sRenderBump = gSavedSettings.getBOOL("RenderObjectBump");
- LLPipeline::sRenderDeferred = LLPipeline::sRenderTransparentWater && LLPipeline::sRenderBump && gSavedSettings.getBOOL("RenderDeferred");
+ LLPipeline::sRenderDeferred = LLPipeline::sRenderTransparentWater && LLPipeline::sRenderBump && gSavedSettings.getBOOL("RenderDeferred");
+ LLRenderTarget::sUseFBO = LLPipeline::sRenderDeferred && gSavedSettings.getBOOL("RenderAvatarVP");
LLVOSurfacePatch::sLODFactor = gSavedSettings.getF32("RenderTerrainLODFactor");
LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4]
gDebugGL = gSavedSettings.getBOOL("RenderDebugGL") || gDebugSession;
@@ -667,6 +657,7 @@ LLAppViewer* LLAppViewer::sInstance = NULL;
LLTextureCache* LLAppViewer::sTextureCache = NULL;
LLImageDecodeThread* LLAppViewer::sImageDecodeThread = NULL;
LLTextureFetch* LLAppViewer::sTextureFetch = NULL;
+LLPurgeDiskCacheThread* LLAppViewer::sPurgeDiskCacheThread = NULL;
std::string getRuntime()
{
@@ -963,10 +954,6 @@ bool LLAppViewer::init()
// *Note: this is where gViewerStats used to be created.
- //
- // Initialize the VFS, and gracefully handle initialization errors
- //
-
if (!initCache())
{
LL_WARNS("InitInfo") << "Failed to init cache" << LL_ENDL;
@@ -1380,7 +1367,6 @@ static LLTrace::BlockTimerStatHandle FTM_TEXTURE_CACHE("Texture Cache");
static LLTrace::BlockTimerStatHandle FTM_DECODE("Image Decode");
static LLTrace::BlockTimerStatHandle FTM_FETCH("Image Fetch");
-static LLTrace::BlockTimerStatHandle FTM_VFS("VFS Thread");
static LLTrace::BlockTimerStatHandle FTM_LFS("LFS Thread");
static LLTrace::BlockTimerStatHandle FTM_PAUSE_THREADS("Pause Threads");
static LLTrace::BlockTimerStatHandle FTM_IDLE("Idle");
@@ -1619,17 +1605,13 @@ bool LLAppViewer::doFrame()
work_pending += updateTextureThreads(max_time);
{
- LL_RECORD_BLOCK_TIME(FTM_VFS);
- io_pending += LLVFSThread::updateClass(1);
- }
- {
LL_RECORD_BLOCK_TIME(FTM_LFS);
io_pending += LLLFSThread::updateClass(1);
}
if (io_pending > 1000)
{
- ms_sleep(llmin(io_pending/100,100)); // give the vfs some time to catch up
+ ms_sleep(llmin(io_pending/100,100)); // give the lfs some time to catch up
}
total_work_pending += work_pending ;
@@ -1646,7 +1628,6 @@ bool LLAppViewer::doFrame()
}
if(!total_io_pending) //pause file threads if nothing to process.
{
- LLVFSThread::sLocal->pause();
LLLFSThread::sLocal->pause();
}
@@ -1711,12 +1692,11 @@ S32 LLAppViewer::updateTextureThreads(F32 max_time)
return work_pending;
}
-void LLAppViewer::flushVFSIO()
+void LLAppViewer::flushLFSIO()
{
while (1)
{
- S32 pending = LLVFSThread::updateClass(0);
- pending += LLLFSThread::updateClass(0);
+ S32 pending = LLLFSThread::updateClass(0);
if (!pending)
{
break;
@@ -1808,7 +1788,7 @@ bool LLAppViewer::cleanup()
LLKeyframeDataCache::clear();
- // End TransferManager before deleting systems it depends on (Audio, VFS, AssetStorage)
+ // End TransferManager before deleting systems it depends on (Audio, AssetStorage)
#if 0 // this seems to get us stuck in an infinite loop...
gTransferManager.cleanup();
#endif
@@ -1875,8 +1855,8 @@ bool LLAppViewer::cleanup()
LL_INFOS() << "Cache files removed" << LL_ENDL;
- // Wait for any pending VFS IO
- flushVFSIO();
+ // Wait for any pending LFS IO
+ flushLFSIO();
LL_INFOS() << "Shutting down Views" << LL_ENDL;
// Destroy the UI
@@ -1960,15 +1940,6 @@ bool LLAppViewer::cleanup()
SUBSYSTEM_CLEANUP(LLWorldMapView);
SUBSYSTEM_CLEANUP(LLFolderViewItem);
- //
- // Shut down the VFS's AFTER the decode manager cleans up (since it cleans up vfiles).
- // Also after viewerwindow is deleted, since it may have image pointers (which have vfiles)
- // Also after shutting down the messaging system since it has VFS dependencies
-
- //
- LL_INFOS() << "Cleaning up VFS" << LL_ENDL;
- SUBSYSTEM_CLEANUP(LLVFile);
-
LL_INFOS() << "Saving Data" << LL_ENDL;
// Store the time of our current logoff
@@ -2057,7 +2028,6 @@ bool LLAppViewer::cleanup()
pending += LLAppViewer::getTextureCache()->update(1); // unpauses the worker thread
pending += LLAppViewer::getImageDecodeThread()->update(1); // unpauses the image thread
pending += LLAppViewer::getTextureFetch()->update(1); // unpauses the texture fetch thread
- pending += LLVFSThread::updateClass(0);
pending += LLLFSThread::updateClass(0);
F64 idle_time = idleTimer.getElapsedTimeF64();
if(!pending)
@@ -2085,6 +2055,7 @@ bool LLAppViewer::cleanup()
sTextureFetch->shutdown();
sTextureCache->shutdown();
sImageDecodeThread->shutdown();
+ sPurgeDiskCacheThread->shutdown();
sTextureFetch->shutDownTextureCacheThread() ;
sTextureFetch->shutDownImageDecodeThread() ;
@@ -2107,6 +2078,8 @@ bool LLAppViewer::cleanup()
sImageDecodeThread = NULL;
delete mFastTimerLogThread;
mFastTimerLogThread = NULL;
+ delete sPurgeDiskCacheThread;
+ sPurgeDiskCacheThread = NULL;
if (LLFastTimerView::sAnalyzePerformance)
{
@@ -2132,28 +2105,11 @@ bool LLAppViewer::cleanup()
gTextureList.shutdown(); // shutdown again in case a callback added something
LLUIImageList::getInstance()->cleanUp();
- // This should eventually be done in LLAppViewer
SUBSYSTEM_CLEANUP(LLImage);
- SUBSYSTEM_CLEANUP(LLVFSThread);
SUBSYSTEM_CLEANUP(LLLFSThread);
-#ifndef LL_RELEASE_FOR_DOWNLOAD
- LL_INFOS() << "Auditing VFS" << LL_ENDL;
- if(gVFS)
- {
- gVFS->audit();
- }
-#endif
-
LL_INFOS() << "Misc Cleanup" << LL_ENDL;
- // For safety, the LLVFS has to be deleted *after* LLVFSThread. This should be cleaned up.
- // (LLVFS doesn't know about LLVFSThread so can't kill pending requests) -Steve
- delete gStaticVFS;
- gStaticVFS = NULL;
- delete gVFS;
- gVFS = NULL;
-
gSavedSettings.cleanup();
LLUIColorTable::instance().clear();
@@ -2213,7 +2169,6 @@ bool LLAppViewer::initThreads()
LLImage::initClass(gSavedSettings.getBOOL("TextureNewByteRange"),gSavedSettings.getS32("TextureReverseByteRange"));
- LLVFSThread::initClass(enable_threads && false);
LLLFSThread::initClass(enable_threads && false);
// Image decoding
@@ -2223,6 +2178,7 @@ bool LLAppViewer::initThreads()
sImageDecodeThread,
enable_threads && true,
app_metrics_qa_mode);
+ LLAppViewer::sPurgeDiskCacheThread = new LLPurgeDiskCacheThread();
if (LLTrace::BlockTimer::sLog || LLTrace::BlockTimer::sMetricLog)
{
@@ -3261,10 +3217,6 @@ LLSD LLAppViewer::getViewerInfo() const
info["GPU_SHADERS"] = gSavedSettings.getBOOL("RenderDeferred") ? "Enabled" : "Disabled";
info["TEXTURE_MEMORY"] = gSavedSettings.getS32("TextureMemory");
- LLSD substitution;
- substitution["datetime"] = (S32)(gVFS ? gVFS->creationTime() : 0);
- info["VFS_TIME"] = LLTrans::getString("AboutTime", substitution);
-
#if LL_DARWIN
info["HIDPI"] = gHiDPISupport;
#endif
@@ -3356,6 +3308,9 @@ LLSD LLAppViewer::getViewerInfo() const
info["SERVER_RELEASE_NOTES_URL"] = mServerReleaseNotesURL;
}
+ // populate field for new local disk cache with some details
+ info["DISK_CACHE_INFO"] = LLDiskCache::getInstance()->getCacheInfo();
+
return info;
}
@@ -4034,7 +3989,7 @@ void LLAppViewer::forceQuit()
void LLAppViewer::fastQuit(S32 error_code)
{
// finish pending transfers
- flushVFSIO();
+ flushLFSIO();
// let sim know we're logging out
sendLogoutRequest();
// flush network buffers by shutting down messaging system
@@ -4223,44 +4178,14 @@ void LLAppViewer::migrateCacheDirectory()
#endif // LL_WINDOWS || LL_DARWIN
}
-void dumpVFSCaches()
-{
- LL_INFOS() << "======= Static VFS ========" << LL_ENDL;
- gStaticVFS->listFiles();
-#if LL_WINDOWS
- LL_INFOS() << "======= Dumping static VFS to StaticVFSDump ========" << LL_ENDL;
- WCHAR w_str[MAX_PATH];
- GetCurrentDirectory(MAX_PATH, w_str);
- S32 res = LLFile::mkdir("StaticVFSDump");
- if (res == -1)
- {
- LL_WARNS() << "Couldn't create dir StaticVFSDump" << LL_ENDL;
- }
- SetCurrentDirectory(utf8str_to_utf16str("StaticVFSDump").c_str());
- gStaticVFS->dumpFiles();
- SetCurrentDirectory(w_str);
-#endif
-
- LL_INFOS() << "========= Dynamic VFS ====" << LL_ENDL;
- gVFS->listFiles();
-#if LL_WINDOWS
- LL_INFOS() << "========= Dumping dynamic VFS to VFSDump ====" << LL_ENDL;
- res = LLFile::mkdir("VFSDump");
- if (res == -1)
- {
- LL_WARNS() << "Couldn't create dir VFSDump" << LL_ENDL;
- }
- SetCurrentDirectory(utf8str_to_utf16str("VFSDump").c_str());
- gVFS->dumpFiles();
- SetCurrentDirectory(w_str);
-#endif
-}
-
//static
U32 LLAppViewer::getTextureCacheVersion()
{
- //viewer texture cache version, change if the texture cache format changes.
- const U32 TEXTURE_CACHE_VERSION = 8;
+ // Viewer texture cache version, change if the texture cache format changes.
+ // 2021-03-10 Bumping up by one to help obviate texture cache issues with
+ // Simple Cache Viewer - see SL-14985 for more information
+ //const U32 TEXTURE_CACHE_VERSION = 8;
+ const U32 TEXTURE_CACHE_VERSION = 9;
return TEXTURE_CACHE_VERSION ;
}
@@ -4282,6 +4207,17 @@ bool LLAppViewer::initCache()
LLAppViewer::getTextureCache()->setReadOnly(read_only) ;
LLVOCache::initParamSingleton(read_only);
+ // initialize the new disk cache using saved settings
+ const std::string cache_dir_name = gSavedSettings.getString("DiskCacheDirName");
+
+ // note that the maximum size of this cache is defined as a percentage of the
+ // total cache size - the 'CacheSize' pref - for all caches.
+ const unsigned int cache_total_size_mb = gSavedSettings.getU32("CacheSize");
+ const double disk_cache_percent = gSavedSettings.getF32("DiskCachePercentOfTotal");
+ const unsigned int disk_cache_mb = cache_total_size_mb * disk_cache_percent / 100;
+ const uintmax_t disk_cache_bytes = disk_cache_mb * 1024 * 1024;
+ const bool enable_cache_debug_info = gSavedSettings.getBOOL("EnableDiskCacheDebugInfo");
+
bool texture_cache_mismatch = false;
if (gSavedSettings.getS32("LocalCacheVersion") != LLAppViewer::getTextureCacheVersion())
{
@@ -4316,6 +4252,7 @@ bool LLAppViewer::initCache()
LL_INFOS("AppCache") << "Cache location changed, cache needs purging" << LL_ENDL;
gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
purgeCache(); // purge old cache
+ gDirUtilp->deleteDirAndContents(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, cache_dir_name));
gSavedSettings.setString("CacheLocation", new_cache_location);
gSavedSettings.setString("CacheLocationTopFolder", gDirUtilp->getBaseFileName(new_cache_location));
}
@@ -4328,11 +4265,26 @@ bool LLAppViewer::initCache()
gSavedSettings.setString("CacheLocationTopFolder", "");
}
- if (mPurgeCache && !read_only)
+ const std::string cache_dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, cache_dir_name);
+ LLDiskCache::initParamSingleton(cache_dir, disk_cache_bytes, enable_cache_debug_info);
+
+ if (!read_only)
{
- LLSplashScreen::update(LLTrans::getString("StartupClearingCache"));
- purgeCache();
+ if (mPurgeCache)
+ {
+ LLSplashScreen::update(LLTrans::getString("StartupClearingCache"));
+ purgeCache();
+
+ // clear the new C++ file system based cache
+ LLDiskCache::getInstance()->clearCache();
+ }
+ else
+ {
+ // purge excessive files from the new file system based cache
+ LLDiskCache::getInstance()->purge();
+ }
}
+ LLAppViewer::getPurgeDiskCacheThread()->start();
LLSplashScreen::update(LLTrans::getString("StartupInitializingTextureCache"));
@@ -4341,172 +4293,18 @@ bool LLAppViewer::initCache()
const S32 MB = 1024 * 1024;
const S64 MIN_CACHE_SIZE = 256 * MB;
const S64 MAX_CACHE_SIZE = 9984ll * MB;
- const S64 MAX_VFS_SIZE = 1024 * MB; // 1 GB
S64 cache_size = (S64)(gSavedSettings.getU32("CacheSize")) * MB;
cache_size = llclamp(cache_size, MIN_CACHE_SIZE, MAX_CACHE_SIZE);
- S64 vfs_size = llmin((S64)((cache_size * 2) / 10), MAX_VFS_SIZE);
- S64 texture_cache_size = cache_size - vfs_size;
+ S64 texture_cache_size = cache_size;
S64 extra = LLAppViewer::getTextureCache()->initCache(LL_PATH_CACHE, texture_cache_size, texture_cache_mismatch);
texture_cache_size -= extra;
-
LLVOCache::getInstance()->initCache(LL_PATH_CACHE, gSavedSettings.getU32("CacheNumberOfRegionsForObjects"), getObjectCacheVersion());
- LLSplashScreen::update(LLTrans::getString("StartupInitializingVFS"));
-
- // Init the VFS
- vfs_size = llmin(vfs_size + extra, MAX_VFS_SIZE);
- vfs_size = (vfs_size / MB) * MB; // make sure it is MB aligned
- U32 vfs_size_u32 = (U32)vfs_size;
- U32 old_vfs_size = gSavedSettings.getU32("VFSOldSize") * MB;
- bool resize_vfs = (vfs_size_u32 != old_vfs_size);
- if (resize_vfs)
- {
- gSavedSettings.setU32("VFSOldSize", vfs_size_u32 / MB);
- }
- LL_INFOS("AppCache") << "VFS CACHE SIZE: " << vfs_size / (1024*1024) << " MB" << LL_ENDL;
-
- // This has to happen BEFORE starting the vfs
- // time_t ltime;
- srand(time(NULL)); // Flawfinder: ignore
- U32 old_salt = gSavedSettings.getU32("VFSSalt");
- U32 new_salt;
- std::string old_vfs_data_file;
- std::string old_vfs_index_file;
- std::string new_vfs_data_file;
- std::string new_vfs_index_file;
- std::string static_vfs_index_file;
- std::string static_vfs_data_file;
-
- if (gSavedSettings.getBOOL("AllowMultipleViewers"))
- {
- // don't mess with renaming the VFS in this case
- new_salt = old_salt;
- }
- else
- {
- do
- {
- new_salt = rand();
- } while(new_salt == old_salt);
- }
-
- old_vfs_data_file = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, VFS_DATA_FILE_BASE) + llformat("%u", old_salt);
-
- // make sure this file exists
- llstat s;
- S32 stat_result = LLFile::stat(old_vfs_data_file, &s);
- if (stat_result)
- {
- // doesn't exist, look for a data file
- std::string mask;
- mask = VFS_DATA_FILE_BASE;
- mask += "*";
-
- std::string dir;
- dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "");
-
- std::string found_file;
- LLDirIterator iter(dir, mask);
- if (iter.next(found_file))
- {
- old_vfs_data_file = gDirUtilp->add(dir, found_file);
-
- S32 start_pos = found_file.find_last_of('.');
- if (start_pos > 0)
- {
- sscanf(found_file.substr(start_pos+1).c_str(), "%d", &old_salt);
- }
- LL_DEBUGS("AppCache") << "Default vfs data file not present, found: " << old_vfs_data_file << " Old salt: " << old_salt << LL_ENDL;
- }
- }
-
- old_vfs_index_file = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, VFS_INDEX_FILE_BASE) + llformat("%u", old_salt);
-
- stat_result = LLFile::stat(old_vfs_index_file, &s);
- if (stat_result)
- {
- // We've got a bad/missing index file, nukem!
- LL_WARNS("AppCache") << "Bad or missing vfx index file " << old_vfs_index_file << LL_ENDL;
- LL_WARNS("AppCache") << "Removing old vfs data file " << old_vfs_data_file << LL_ENDL;
- LLFile::remove(old_vfs_data_file);
- LLFile::remove(old_vfs_index_file);
-
- // Just in case, nuke any other old cache files in the directory.
- std::string dir;
- dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "");
-
- std::string mask;
- mask = VFS_DATA_FILE_BASE;
- mask += "*";
-
- gDirUtilp->deleteFilesInDir(dir, mask);
-
- mask = VFS_INDEX_FILE_BASE;
- mask += "*";
-
- gDirUtilp->deleteFilesInDir(dir, mask);
- }
-
- new_vfs_data_file = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, VFS_DATA_FILE_BASE) + llformat("%u", new_salt);
- new_vfs_index_file = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, VFS_INDEX_FILE_BASE) + llformat("%u", new_salt);
-
- static_vfs_data_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "static_data.db2");
- static_vfs_index_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "static_index.db2");
-
- if (resize_vfs)
- {
- LL_DEBUGS("AppCache") << "Removing old vfs and re-sizing" << LL_ENDL;
-
- LLFile::remove(old_vfs_data_file);
- LLFile::remove(old_vfs_index_file);
- }
- else if (old_salt != new_salt)
- {
- // move the vfs files to a new name before opening
- LL_DEBUGS("AppCache") << "Renaming " << old_vfs_data_file << " to " << new_vfs_data_file << LL_ENDL;
- LL_DEBUGS("AppCache") << "Renaming " << old_vfs_index_file << " to " << new_vfs_index_file << LL_ENDL;
- LLFile::rename(old_vfs_data_file, new_vfs_data_file);
- LLFile::rename(old_vfs_index_file, new_vfs_index_file);
- }
-
- // Startup the VFS...
- gSavedSettings.setU32("VFSSalt", new_salt);
-
- // Don't remove VFS after viewer crashes. If user has corrupt data, they can reinstall. JC
- gVFS = LLVFS::createLLVFS(new_vfs_index_file, new_vfs_data_file, false, vfs_size_u32, false);
- if (!gVFS)
- {
- return false;
- }
-
- gStaticVFS = LLVFS::createLLVFS(static_vfs_index_file, static_vfs_data_file, true, 0, false);
- if (!gStaticVFS)
- {
- return false;
- }
-
- BOOL success = gVFS->isValid() && gStaticVFS->isValid();
- if (!success)
- {
- return false;
- }
- else
- {
- LLVFile::initClass();
-
-#ifndef LL_RELEASE_FOR_DOWNLOAD
- if (gSavedSettings.getBOOL("DumpVFSCaches"))
- {
- dumpVFSCaches();
- }
-#endif
-
- return true;
- }
+ return true;
}
void LLAppViewer::addOnIdleCallback(const boost::function<void()>& cb)
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 95f6efa29a..0f06889d20 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -1,5 +1,6 @@
/**
* @mainpage
+ * @mainpage
*
* This is the sources for the Second Life Viewer;
* information on the open source project is at
@@ -57,6 +58,7 @@ class LLImageDecodeThread;
class LLTextureFetch;
class LLWatchdogTimeout;
class LLViewerJoystick;
+class LLPurgeDiskCacheThread;
class LLViewerRegion;
extern LLTrace::BlockTimerStatHandle FTM_FRAME;
@@ -83,7 +85,7 @@ public:
virtual bool frame(); // Override for application body logic
// Application control
- void flushVFSIO(); // waits for vfs transfers to complete
+ void flushLFSIO(); // waits for lfs transfers to complete
void forceQuit(); // Puts the viewer into 'shutting down without error' mode.
void fastQuit(S32 error_code = 0); // Shuts down the viewer immediately after sending a logout message
void requestQuit(); // Request a quit. A kinder, gentler quit.
@@ -116,6 +118,7 @@ public:
static LLTextureCache* getTextureCache() { return sTextureCache; }
static LLImageDecodeThread* getImageDecodeThread() { return sImageDecodeThread; }
static LLTextureFetch* getTextureFetch() { return sTextureFetch; }
+ static LLPurgeDiskCacheThread* getPurgeDiskCacheThread() { return sPurgeDiskCacheThread; }
static U32 getTextureCacheVersion() ;
static U32 getObjectCacheVersion() ;
@@ -284,6 +287,7 @@ private:
static LLTextureCache* sTextureCache;
static LLImageDecodeThread* sImageDecodeThread;
static LLTextureFetch* sTextureFetch;
+ static LLPurgeDiskCacheThread* sPurgeDiskCacheThread;
S32 mNumSessions;
@@ -382,12 +386,6 @@ extern BOOL gRestoreGL;
extern bool gUseWireframe;
extern bool gInitialDeferredModeForWireframe;
-// VFS globals - gVFS is for general use
-// gStaticVFS is read-only and is shipped w/ the viewer
-// it has pre-cache data like the UI .TGAs
-class LLVFS;
-extern LLVFS *gStaticVFS;
-
extern LLMemoryInfo gSysMemory;
extern U64Bytes gMemoryAllocated;
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 5556ec8f76..ee533875b6 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -504,7 +504,7 @@ void LLAppViewerWin32::disableWinErrorReporting()
}
}
-const S32 MAX_CONSOLE_LINES = 500;
+const S32 MAX_CONSOLE_LINES = 7500;
// Only defined in newer SDKs than we currently use
#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 4
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index bf10a9f2b4..9031ea5b1b 100644
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -52,7 +52,7 @@
#include "lldir.h"
#include "llnotificationsutil.h"
#include "llviewerstats.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "lluictrlfactory.h"
#include "lltrans.h"
@@ -116,7 +116,7 @@ namespace
}
// *NOTE$: A minor specialization of LLScriptAssetUpload, it does not require a buffer
-// (and does not save a buffer to the vFS) and it finds the compile queue window and
+// (and does not save a buffer to the cache) and it finds the compile queue window and
// displays a compiling message.
class LLQueuedScriptAssetUpload : public LLScriptAssetUpload
{
@@ -134,8 +134,8 @@ public:
virtual LLSD prepareUpload()
{
/* *NOTE$: The parent class (LLScriptAssetUpload will attempt to save
- * the script buffer into to the VFS. Since the resource is already in
- * the VFS we don't want to do that. Just put a compiling message in
+ * the script buffer into to the cache. Since the resource is already in
+ * the cache we don't want to do that. Just put a compiling message in
* the window and move on
*/
LLFloaterCompileQueue* queue = LLFloaterReg::findTypedInstance<LLFloaterCompileQueue>("compile_queue", LLSD(mQueueId));
@@ -283,11 +283,11 @@ void LLFloaterCompileQueue::handleHTTPResponse(std::string pumpName, const LLSD
LLEventPumps::instance().post(pumpName, expresult);
}
-// *TODO: handleSCriptRetrieval is passed into the VFS via a legacy C function pointer
+// *TODO: handleSCriptRetrieval is passed into the cache via a legacy C function pointer
// future project would be to convert these to C++ callables (std::function<>) so that
// we can use bind and remove the userData parameter.
//
-void LLFloaterCompileQueue::handleScriptRetrieval(LLVFS *vfs, const LLUUID& assetId,
+void LLFloaterCompileQueue::handleScriptRetrieval(const LLUUID& assetId,
LLAssetType::EType type, void* userData, S32 status, LLExtStat extStatus)
{
LLSD result(LLSD::emptyMap());
diff --git a/indra/newview/llcompilequeue.h b/indra/newview/llcompilequeue.h
index adb854875a..a9bac345b5 100644
--- a/indra/newview/llcompilequeue.h
+++ b/indra/newview/llcompilequeue.h
@@ -135,7 +135,7 @@ protected:
//bool checkAssetId(const LLUUID &assetId);
static void handleHTTPResponse(std::string pumpName, const LLSD &expresult);
- static void handleScriptRetrieval(LLVFS *vfs, const LLUUID& assetId, LLAssetType::EType type, void* userData, S32 status, LLExtStat extStatus);
+ static void handleScriptRetrieval(const LLUUID& assetId, LLAssetType::EType type, void* userData, S32 status, LLExtStat extStatus);
private:
static void processExperienceIdResults(LLSD result, LLUUID parent);
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 687b13d2c8..eb0bd0de4e 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1526,7 +1526,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
}
LLVOAvatar *attached_av = avatarp->getAttachedAvatar();
- if (attached_av && LLVOAvatar::AOA_NORMAL != attached_av->getOverallAppearance())
+ if (attached_av && (LLVOAvatar::AOA_NORMAL != attached_av->getOverallAppearance() || !gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_AVATAR)))
{
// Animesh attachment of a jellydolled or invisible parent - don't show
return;
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index 2fc496a144..04ba4416d7 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -136,7 +136,7 @@ public:
S32 getFileCount() const { return (S32)mFiles.size(); }
- // See llvfs/lldir.h : getBaseFileName and getDirName to extract base or directory names
+ // see lldir.h : getBaseFileName and getDirName to extract base or directory names
// clear any lists of buffers or whatever, and make sure the file
// picker isn't locked.
diff --git a/indra/newview/llfloater360capture.cpp b/indra/newview/llfloater360capture.cpp
new file mode 100644
index 0000000000..745f154535
--- /dev/null
+++ b/indra/newview/llfloater360capture.cpp
@@ -0,0 +1,930 @@
+/**
+ * @file llfloater360capture.cpp
+ * @author Callum Prentice (callum@lindenlab.com)
+ * @brief Floater code for the 360 Capture feature
+ *
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloater360capture.h"
+
+#include "llagent.h"
+#include "llagentui.h"
+#include "llbase64.h"
+#include "llcallbacklist.h"
+#include "llenvironment.h"
+#include "llimagejpeg.h"
+#include "llmediactrl.h"
+#include "llradiogroup.h"
+#include "llslurl.h"
+#include "lltextbox.h"
+#include "lltrans.h"
+#include "lluictrlfactory.h"
+#include "llversioninfo.h"
+#include "llviewercamera.h"
+#include "llviewercontrol.h"
+#include "llviewerpartsim.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+#include "pipeline.h"
+
+#include <iterator>
+
+LLFloater360Capture::LLFloater360Capture(const LLSD& key)
+ : LLFloater(key)
+{
+ // The handle to embedded browser that we use to
+ // render the WebGL preview as we as host the
+ // Cube Map to Equirectangular image code
+ mWebBrowser = nullptr;
+
+ // Ask the simulator to send us everything (and not just
+ // what it thinks the connected Viewer can see) until
+ // such time as we ask it not to (the dtor). If we crash or
+ // otherwise, exit before this is turned off, the Simulator
+ // will take care of cleaning up for us.
+ if (gSavedSettings.getBOOL("360CaptureUseInterestListCap"))
+ {
+ // send everything to us for as long as this floater is open
+ const bool send_everything = true;
+ changeInterestListMode(send_everything);
+ }
+}
+
+LLFloater360Capture::~LLFloater360Capture()
+{
+ if (mWebBrowser)
+ {
+ mWebBrowser->navigateStop();
+ mWebBrowser->clearCache();
+ mWebBrowser->unloadMediaSource();
+ }
+
+ // Tell the Simulator not to send us everything anymore
+ // and revert to the regular "keyhole" frustum of interest
+ // list updates.
+ if (gSavedSettings.getBOOL("360CaptureUseInterestListCap"))
+ {
+ const bool send_everything = false;
+ changeInterestListMode(send_everything);
+ }
+}
+
+BOOL LLFloater360Capture::postBuild()
+{
+ mCaptureBtn = getChild<LLUICtrl>("capture_button");
+ mCaptureBtn->setCommitCallback(boost::bind(&LLFloater360Capture::onCapture360ImagesBtn, this));
+
+ mSaveLocalBtn = getChild<LLUICtrl>("save_local_button");
+ mSaveLocalBtn->setCommitCallback(boost::bind(&LLFloater360Capture::onSaveLocalBtn, this));
+ mSaveLocalBtn->setEnabled(false);
+
+ mWebBrowser = getChild<LLMediaCtrl>("360capture_contents");
+ mWebBrowser->addObserver(this);
+
+ // There is a group of radio buttons that define the quality
+ // by each having a 'value' that is returns equal to the pixel
+ // size (width == height)
+ mQualityRadioGroup = getChild<LLRadioGroup>("360_quality_selection");
+ mQualityRadioGroup->setCommitCallback(boost::bind(&LLFloater360Capture::onChooseQualityRadioGroup, this));
+
+ // UX/UI called for preview mode (always the first index/option)
+ // by default each time vs restoring the last value
+ mQualityRadioGroup->setSelectedIndex(0);
+
+ // Construct a URL pointing to the first page to load. Although
+ // we do not use this page for anything (after some significant
+ // design changes), we retain the code to load the start page
+ // in case that changes again one day. It also makes sure the
+ // embedded browser is active and ready to go for when the real
+ // page with the 360 preview is navigated to.
+ std::string url = STRINGIZE(
+ "file:///" <<
+ getHTMLBaseFolder() <<
+ mDefaultHTML
+ );
+ mWebBrowser->navigateTo(url);
+
+ // initial pass at determining what size (width == height since
+ // the cube map images are square) we should capture at.
+ setSourceImageSize();
+
+ // the size of the output equirectangular image. The height of an EQR image
+ // is always 1/2 of the width so we should not store it but rather,
+ // calculate it from the width directly
+ mOutputImageWidth = gSavedSettings.getU32("360CaptureOutputImageWidth");
+ mOutputImageHeight = mOutputImageWidth / 2;
+
+ // enable resizing and enable for width and for height
+ enableResizeCtrls(true, true, true);
+
+ // initial heading that consumers of the equirectangular image
+ // (such as Facebook or Flickr) use to position initial view -
+ // we set during capture - stored as degrees (0..359)
+ mInitialHeadingDeg = 0.0;
+
+ // save directory in which to store the images (must obliviously be
+ // writable by the viewer). Also create it for users who haven't
+ // used the 360 feature before.
+ mImageSaveDir = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + "eqrimg";
+ LLFile::mkdir(mImageSaveDir);
+
+ // We do an initial capture when the floater is opened, albeit at a 'preview'
+ // quality level (really low resolution, but really fast)
+ onCapture360ImagesBtn();
+
+ return true;
+}
+
+// called when the user choose a quality level using
+// the buttons in the radio group
+void LLFloater360Capture::onChooseQualityRadioGroup()
+{
+ // set the size of the captured cube map images based
+ // on the quality level chosen
+ setSourceImageSize();
+}
+
+// Using a new capability, tell the simulator that we want it to send everything
+// it knows about and not just what is in front of the camera, in its view
+// frustum. We need this feature so that the contents of the region that appears
+// in the 6 snapshots which we cannot see and is normally not "considered", is
+// also rendered. Typically, this is turned on when the 360 capture floater is
+// opened and turned off when it is closed.
+// Note: for this version, we do not have a way to determine when "everything"
+// has arrived and has been rendered so for now, the proposal is that users
+// will need to experiment with the low resolution version and wait for some
+// (hopefully) small period of time while the full contents resolves.
+// Pass in a flag to ask the simulator/interest list to "send everything" or
+// not (the default mode)
+void LLFloater360Capture::changeInterestListMode(bool send_everything)
+{
+ LLSD body;
+
+ if (send_everything)
+ {
+ body["mode"] = LLSD::String("360");
+ }
+ else
+ {
+ body["mode"] = LLSD::String("default");
+ }
+
+ if (gAgent.requestPostCapability("InterestList", body, [](const LLSD & response)
+ {
+ LL_INFOS("360Capture") <<
+ "InterestList capability responded: \n" <<
+ ll_pretty_print_sd(response) <<
+ LL_ENDL;
+ }))
+ {
+ LL_INFOS("360Capture") <<
+ "Successfully posted an InterestList capability request with payload: \n" <<
+ ll_pretty_print_sd(body) <<
+ LL_ENDL;
+ }
+ else
+ {
+ LL_INFOS("360Capture") <<
+ "Unable to post an InterestList capability request with payload: \n" <<
+ ll_pretty_print_sd(body) <<
+ LL_ENDL;
+ }
+}
+
+// There is is a setting (360CaptureSourceImageSize) that holds the size
+// (width == height since it's a square) of each of the 6 source snapshots.
+// However there are some known (and I dare say, some more unknown conditions
+// where the specified size is not possible and this function tries to figure it
+// out and change that setting to the optimal value for the current conditions.
+void LLFloater360Capture::setSourceImageSize()
+{
+ mSourceImageSize = mQualityRadioGroup->getSelectedValue().asInteger();
+
+ // If deferred rendering is off, we need to shrink the window we capture
+ // until it's smaller than the Viewer window dimensions.
+ if (!LLPipeline::sRenderDeferred)
+ {
+ LLRect window_rect = gViewerWindow->getWindowRectRaw();
+ S32 window_width = window_rect.getWidth();
+ S32 window_height = window_rect.getHeight();
+
+ // It's not possible (as I had hoped) to always render to an off screen
+ // buffer regardless of deferred rendering status so the next best
+ // option is to render to a buffer that is the size of the users app
+ // window. Note, this was changed - before it chose the smallest
+ // power of 2 less than the window size - but since that meant a
+ // 1023 height app window would result in a 512 pixel capture, Maxim
+ // tried this and it does indeed appear to work. Mayb need to revisit
+ // after the project viewer pass if people on low end graphics systems
+ // after having issues.
+ if (mSourceImageSize > window_width || mSourceImageSize > window_height)
+ {
+ mSourceImageSize = llmin(window_width, window_height, mSourceImageSize);
+ LL_INFOS("360Capture") << "Deferred rendering is forcing a smaller capture size: " << mSourceImageSize << LL_ENDL;
+ }
+
+ // there has to be an easier way than this to get the value
+ // from the radio group item at index 0. Why doesn't
+ // LLRadioGroup::getSelectedValue(int index) exist?
+ int index = mQualityRadioGroup->getSelectedIndex();
+ mQualityRadioGroup->setSelectedIndex(0);
+ int min_size = mQualityRadioGroup->getSelectedValue().asInteger();
+ mQualityRadioGroup->setSelectedIndex(index);
+
+ // If the maximum size we can support falls below a threshold then
+ // we should display a message in the log so we can try to debug
+ // why this is happening
+ if (mSourceImageSize < min_size)
+ {
+ LL_INFOS("360Capture") << "Small snapshot size due to deferred rendering and small app window" << LL_ENDL;
+ }
+ }
+}
+
+// This function shouldn't exist! We use the tooltip text from
+// the corresponding XUI file (floater_360capture.xml) as the
+// overlay text for the final web page to inform the user
+// about the quality level in play. There ought to be a
+// UI function like LLView* getSelectedItemView() or similar
+// but as far as I can tell, there isn't so we have to resort
+// to finding it ourselves with this icky code..
+const std::string LLFloater360Capture::getSelectedQualityTooltip()
+{
+ // safey (or bravery?)
+ if (mQualityRadioGroup != nullptr)
+ {
+ // for all the child widgets for the radio group
+ // (just the radio buttons themselves I think)
+ for (child_list_const_reverse_iter_t iter = mQualityRadioGroup->getChildList()->rbegin();
+ iter != mQualityRadioGroup->getChildList()->rend();
+ ++iter)
+ {
+ // if we match the selected index (which we can get easily)
+ // with our position in the list of children
+ if (mQualityRadioGroup->getSelectedIndex() ==
+ std::distance(mQualityRadioGroup->getChildList()->rend(), iter) - 1)
+ {
+ // return the plain old tooltip text
+ return (*iter)->getToolTip();
+ }
+ }
+ }
+
+ // if it's not found or not available, return an empty string
+ return std::string();
+}
+
+// Some of the 'magic' happens via a web page in an HTML directory
+// and this code provides a single point of reference for its' location
+const std::string LLFloater360Capture::getHTMLBaseFolder()
+{
+ std::string folder_name = gDirUtilp->getSkinDir();
+ folder_name += gDirUtilp->getDirDelimiter();
+ folder_name += "html";
+ folder_name += gDirUtilp->getDirDelimiter();
+ folder_name += "common";
+ folder_name += gDirUtilp->getDirDelimiter();
+ folder_name += "equirectangular";
+ folder_name += gDirUtilp->getDirDelimiter();
+
+ return folder_name;
+}
+
+// triggered when the 'capture' button in the UI is pressed
+void LLFloater360Capture::onCapture360ImagesBtn()
+{
+ // launch the main capture code in a coroutine so we can
+ // yield/suspend at some points to give the main UI
+ // thread a look-in occasionally.
+ LLCoros::instance().launch("capture360cap", [this]()
+ {
+ capture360Images();
+ });
+}
+
+// Gets the full path name for a given JavaScript file in the HTML folder. We
+// use this ultimately as a parameter to the main web app so it knows where to find
+// the JavaScript array containing the 6 cube map images, stored as data URLs
+const std::string LLFloater360Capture::makeFullPathToJS(const std::string filename)
+{
+ std::string full_js_path = mImageSaveDir;
+ full_js_path += gDirUtilp->getDirDelimiter();
+ full_js_path += filename;
+
+ return full_js_path;
+}
+
+// Write the header/prequel portion of the JavaScript array of data urls
+// that we use to store the cube map images in (so the web code can load
+// them without tweaking browser security - we'd have to do this if they
+// we stored as plain old images) This deliberately overwrites the old
+// one, if it exists
+void LLFloater360Capture::writeDataURLHeader(const std::string filename)
+{
+ llofstream file_handle(filename.c_str());
+ if (file_handle.is_open())
+ {
+ file_handle << "// cube map images for Second Life Viewer panorama 360 images" << std::endl;
+ file_handle.close();
+ }
+}
+
+// Write the footer/sequel portion of the JavaScript image code. When this is
+// called, the current file on disk will contain the header and the 6 data
+// URLs, each with a well specified name. This final piece of JavaScript code
+// creates an array from those data URLs that the main application can
+// reference and read.
+void LLFloater360Capture::writeDataURLFooter(const std::string filename)
+{
+ llofstream file_handle(filename.c_str(), std::ios_base::app);
+ if (file_handle.is_open())
+ {
+ file_handle << "var cubemap_img_js = [" << std::endl;
+ file_handle << " img_posx, img_negx," << std::endl;
+ file_handle << " img_posy, img_negy," << std::endl;
+ file_handle << " img_posz, img_negz," << std::endl;
+ file_handle << "];" << std::endl;
+
+ file_handle.close();
+ }
+}
+
+// Given a filename, a chunk of data (representing an image file) and the size
+// of the buffer, we create a BASE64 encoded string and use it to build a JavaScript
+// data URL that represents the image in a web browser environment
+bool LLFloater360Capture::writeDataURL(const std::string filename, const std::string prefix, U8* data, unsigned int data_len)
+{
+ LL_INFOS("360Capture") << "Writing data URL for " << prefix << " to " << filename << LL_ENDL;
+
+ const std::string data_url = LLBase64::encode(data, data_len);
+
+ llofstream file_handle(filename.c_str(), std::ios_base::app);
+ if (file_handle.is_open())
+ {
+ file_handle << "var img_";
+ file_handle << prefix;
+ file_handle << " = '";
+ file_handle << "data:image/jpeg; base64,";
+ file_handle << data_url;
+ file_handle << "'";
+ file_handle << std::endl;
+ file_handle.close();
+
+ return true;
+ }
+
+ return false;
+}
+
+// Encode the image from each of the 6 snapshots and save it out to
+// the JavaScript array of data URLs
+void LLFloater360Capture::encodeAndSave(LLPointer<LLImageRaw> raw_image, const std::string filename, const std::string prefix)
+{
+ // the default quality for the JPEG encoding is set quite high
+ // but this still seems to be a reasonable compromise for
+ // quality/size and is still much smaller than equivalent PNGs
+ int jpeg_encode_quality = gSavedSettings.getU32("360CaptureJPEGEncodeQuality");
+ LLPointer<LLImageJPEG> jpeg_image = new LLImageJPEG(jpeg_encode_quality);
+
+ // Actually encode the JPEG image. This is where a lot of time
+ // is spent now that the snapshot capture process has been
+ // optimized. The encode_time parameter doesn't appear to be
+ // used anymore.
+ const int encode_time = 0;
+ bool resultjpeg = jpeg_image->encode(raw_image, encode_time);
+
+ if (resultjpeg)
+ {
+ // save individual cube map images as real JPEG files
+ // for debugging or curiosity) based on debug settings
+ if (gSavedSettings.getBOOL("360CaptureDebugSaveImage"))
+ {
+ const std::string jpeg_filename = STRINGIZE(
+ gDirUtilp->getLindenUserDir() <<
+ gDirUtilp->getDirDelimiter() <<
+ "eqrimg" <<
+ gDirUtilp->getDirDelimiter() <<
+ prefix <<
+ "." <<
+ jpeg_image->getExtension()
+ );
+
+ LL_INFOS("360Capture") << "Saving debug JPEG image as " << jpeg_filename << LL_ENDL;
+ jpeg_image->save(jpeg_filename);
+ }
+
+ // actually write the JPEG image to disk as a data URL
+ writeDataURL(filename, prefix, jpeg_image->getData(), jpeg_image->getDataSize());
+ }
+}
+
+// Defer back to the main loop for a single rendered frame to give
+// the renderer a chance to update the UI if it is needed
+void LLFloater360Capture::suspendForAFrame()
+{
+ const U32 frame_count_delta = 1;
+ U32 curr_frame_count = LLFrameTimer::getFrameCount();
+ while (LLFrameTimer::getFrameCount() <= curr_frame_count + frame_count_delta)
+ {
+ llcoro::suspend();
+ }
+}
+
+// A debug version of the snapshot code that simply fills the
+// buffer with a pattern that can be used to investigate
+// issues with encoding and saving off each RAW image.
+// Probably not needed anymore but saving here just in case.
+void LLFloater360Capture::mockSnapShot(LLImageRaw* raw)
+{
+ unsigned int width = raw->getWidth();
+ unsigned int height = raw->getHeight();
+ unsigned int depth = raw->getComponents();
+ unsigned char* pixels = raw->getData();
+
+ for (int y = 0; y < height; y++)
+ {
+ for (int x = 0; x < width; x++)
+ {
+ unsigned long offset = y * width * depth + x * depth;
+ unsigned char red = x * 256 / width;
+ unsigned char green = y * 256 / height;
+ unsigned char blue = ((x + y) / 2) * 256 / (width + height) / 2;
+ pixels[offset + 0] = red;
+ pixels[offset + 1] = green;
+ pixels[offset + 2] = blue;
+ }
+ }
+}
+
+// The main code that actually captures all 6 images and then saves them out to
+// disk before navigating the embedded web browser to the page with the WebGL
+// application that consumes them and creates an EQR image. This code runs as a
+// coroutine so it can be suspended at certain points.
+void LLFloater360Capture::capture360Images()
+{
+ // recheck the size of the cube map source images in case it changed
+ // since it was set when we opened the floater
+ setSourceImageSize();
+
+ // disable buttons while we are capturing
+ mCaptureBtn->setEnabled(false);
+ mSaveLocalBtn->setEnabled(false);
+
+ bool render_attached_lights = LLPipeline::sRenderAttachedLights;
+ // determine whether or not to include avatar in the scene as we capture the 360 panorama
+ if (gSavedSettings.getBOOL("360CaptureHideAvatars"))
+ {
+ // Turn off the avatar if UI tells us to hide it.
+ // Note: the original call to gAvatar.hide(FALSE) did *not* hide
+ // attachments and so for most residents, there would be some debris
+ // left behind in the snapshot.
+ // Note: this toggles so if it set to on, this will turn it off and
+ // the subsequent call to the same thing after capture is finished
+ // will turn it back on again. Similarly, for the case where it
+ // was set to off - I think this is what we need
+ LLPipeline::toggleRenderTypeControl(LLPipeline::RENDER_TYPE_AVATAR);
+ LLPipeline::toggleRenderTypeControl(LLPipeline::RENDER_TYPE_PARTICLES);
+ LLPipeline::sRenderAttachedLights = FALSE;
+ }
+
+ // these are the 6 directions we will point the camera - essentially,
+ // North, South, East, West, Up, Down
+ LLVector3 look_dirs[6] = { LLVector3(1, 0, 0), LLVector3(0, 1, 0), LLVector3(0, 0, 1), LLVector3(-1, 0, 0), LLVector3(0, -1, 0), LLVector3(0, 0, -1) };
+ LLVector3 look_upvecs[6] = { LLVector3(0, 0, 1), LLVector3(0, 0, 1), LLVector3(0, -1, 0), LLVector3(0, 0, 1), LLVector3(0, 0, 1), LLVector3(0, 1, 0) };
+
+ // save current view/camera settings so we can restore them afterwards
+ S32 old_occlusion = LLPipeline::sUseOcclusion;
+
+ // set new parameters specific to the 360 requirements
+ LLPipeline::sUseOcclusion = 0;
+ LLViewerCamera* camera = LLViewerCamera::getInstance();
+ F32 old_fov = camera->getView();
+ F32 old_aspect = camera->getAspect();
+ F32 old_yaw = camera->getYaw();
+
+ // stop the motion of as much of the world moving as much as we can
+ freezeWorld(true);
+
+ // Save the direction (in degrees) the camera is looking when we
+ // take the shot since that is what we write to image metadata
+ // 'GPano:InitialViewHeadingDegrees' field.
+ // We need to convert from the angle getYaw() gives us into something
+ // the XMP data field wants (N=0, E=90, S=180, W= 270 etc.)
+ mInitialHeadingDeg = (360 + 90 - (int)(camera->getYaw() * RAD_TO_DEG)) % 360;
+ LL_INFOS("360Capture") << "Recording a heading of " << (int)(mInitialHeadingDeg) << LL_ENDL;
+
+ // camera constants for the square, cube map capture image
+ camera->setAspect(1.0); // must set aspect ratio first to avoid undesirable clamping of vertical FoV
+ camera->setView(F_PI_BY_TWO);
+ camera->yaw(0.0);
+
+ // record how many times we changed camera to try to understand the "all shots are the same issue"
+ unsigned int camera_changed_times = 0;
+
+ // the name of the JavaScript file written out that contains the 6 cube map images
+ // stored as a JavaScript array of data URLs. If you change this filename, you must
+ // also change the corresponding entry in the HTML file that uses it -
+ // (newview/skins/default/html/common/equirectangular/display_eqr.html)
+ const std::string cumemap_js_filename("cubemap_img.js");
+
+ // construct the full path to this file - typically stored in the users'
+ // Second Life settings / username / eqrimg folder.
+ const std::string cubemap_js_full_path = makeFullPathToJS(cumemap_js_filename);
+
+ // Write the JavaScript file header (the top of the file before the
+ // declarations of the actual data URLs array). In practice, all this writes
+ // is a comment - it's main purpose is to reset the file from the last time
+ // it was written
+ writeDataURLHeader(cubemap_js_full_path);
+
+ // the names of the prefixes we assign as the name to each data URL and are then
+ // consumed by the WebGL application. Nominally, they stand for positive and
+ // negative in the X/Y/Z directions.
+ static const std::string prefixes[6] =
+ {
+ "posx", "posz", "posy",
+ "negx", "negz", "negy",
+ };
+
+ // number of times to render the scene (display(..) inside
+ // the simple snapshot function in llViewerWindow.
+ // Note: rendering even just 1 more time (for a total of 2)
+ // has a dramatic effect on the scene contents and *much*
+ // less of it is missing. More investigation required
+ // but for the moment, this helps with missing content
+ // because of interest list issues.
+ int num_render_passes = gSavedSettings.getU32("360CaptureNumRenderPasses");
+
+ // time the encode process for later optimization
+ auto encode_time_total = 0.0;
+
+ // for each of the 6 directions we shoot...
+ for (int i = 0; i < 6; i++)
+ {
+ // these buffers are where the raw, captured pixels are stored and
+ // the first time we use them, we have to make a new one
+ if (mRawImages[i] == nullptr)
+ {
+ mRawImages[i] = new LLImageRaw(mSourceImageSize, mSourceImageSize, 3);
+ }
+ else
+ // subsequent capture with floater open so we resize the buffer from
+ // the previous run
+ {
+ // LLImageRaw deletes the old one via operator= but just to be
+ // sure, we delete its' large data member first...
+ mRawImages[i]->deleteData();
+ mRawImages[i] = new LLImageRaw(mSourceImageSize, mSourceImageSize, 3);
+ }
+
+ // set up camera to look in each direction
+ camera->lookDir(look_dirs[i], look_upvecs[i]);
+
+ // record if camera changed to try to understand the "all shots are the same issue"
+ if (camera->isChanged())
+ {
+ ++camera_changed_times;
+ }
+
+ // call the (very) simplified snapshot code that simply deals
+ // with a single image, no sub-images etc. but is very fast
+ gViewerWindow->simpleSnapshot(mRawImages[i],
+ mSourceImageSize, mSourceImageSize, num_render_passes);
+
+ // encode each image and write to disk while saving how long it took to do so
+ auto t_start = std::chrono::high_resolution_clock::now();
+ encodeAndSave(mRawImages[i], cubemap_js_full_path, prefixes[i]);
+ auto t_end = std::chrono::high_resolution_clock::now();
+ auto duration = std::chrono::duration_cast<std::chrono::duration<double>>(t_end - t_start);
+ encode_time_total += duration.count();
+
+ // ping the main loop in case the snapshot process takes a really long
+ // time and we get disconnected
+ LLAppViewer::instance()->pingMainloopTimeout("LLFloater360Capture::capture360Images");
+ }
+
+ // display time to encode all 6 images. It tends to be a fairly linear
+ // time for each so we don't need to worry about displaying the time
+ // for each - this gives us plenty to use for optimizing
+ LL_INFOS("360Capture") <<
+ "Time to encode and save 6 images was " <<
+ encode_time_total <<
+ " seconds" <<
+ LL_ENDL;
+
+ // Write the JavaScript file footer (the bottom of the file after the
+ // declarations of the actual data URLs array). The footer comprises of
+ // a JavaScript array declaration that references the 6 data URLs generated
+ // previously and is what is referred to in the display HTML file
+ // (newview/skins/default/html/common/equirectangular/display_eqr.html)
+ writeDataURLFooter(cubemap_js_full_path);
+
+ // unfreeze the world now we have our shots
+ freezeWorld(false);
+
+ // restore original view/camera/avatar settings settings
+ camera->setAspect(old_aspect);
+ camera->setView(old_fov);
+ camera->yaw(old_yaw);
+ LLPipeline::sUseOcclusion = old_occlusion;
+
+ // if we toggled off the avatar because the Hide check box was ticked,
+ // we should toggle it back to where it was before we started the capture
+ if (gSavedSettings.getBOOL("360CaptureHideAvatars"))
+ {
+ LLPipeline::toggleRenderTypeControl(LLPipeline::RENDER_TYPE_AVATAR);
+ LLPipeline::toggleRenderTypeControl(LLPipeline::RENDER_TYPE_PARTICLES);
+ LLPipeline::sRenderAttachedLights = render_attached_lights;
+ }
+
+ // record that we missed some shots in the log for later debugging
+ // note: we use 5 and not 6 because the first shot isn't regarded
+ // as a change - only the subsequent 5 are
+ if (camera_changed_times < 5)
+ {
+ LL_INFOS("360Capture") << "Warning: we only captured " << camera_changed_times << " images." << LL_ENDL;
+ }
+
+ // now we have the 6 shots saved in a well specified location,
+ // we can load the web content that uses them
+ std::string url = "file:///" + getHTMLBaseFolder() + mEqrGenHTML;
+ mWebBrowser->navigateTo(url);
+
+ // page is loaded and ready so we can turn on the buttons again
+ mCaptureBtn->setEnabled(true);
+ mSaveLocalBtn->setEnabled(true);
+
+ // allow the UI to update by suspending and waiting for the
+ // main render loop to update the UI
+ suspendForAFrame();
+}
+
+// once the request is made to navigate to the web page containing the code
+// to process the 6 images into an EQR one, we have to wait for it to finish
+// loaded - we get a "navigate complete" event when that happens that we can act on
+void LLFloater360Capture::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
+{
+ switch (event)
+ {
+ // not used right now but retaining because this event might
+ // be useful for a feature I am hoping to add
+ case MEDIA_EVENT_LOCATION_CHANGED:
+ break;
+
+ // navigation in the browser completed
+ case MEDIA_EVENT_NAVIGATE_COMPLETE:
+ {
+ // Confirm that the navigation event does indeed apply to the
+ // page we are looking for. At the moment, this is the only
+ // one we care about so the test is superfluous but that might change.
+ std::string navigate_url = self->getNavigateURI();
+ if (navigate_url.find(mEqrGenHTML) != std::string::npos)
+ {
+ // this string is being passed across to the web so replace all the windows backslash
+ // characters with forward slashes or (I think) the backslashes are treated as escapes
+ std::replace(mImageSaveDir.begin(), mImageSaveDir.end(), '\\', '/');
+
+ // we store the camera FOV (field of view) in a saved setting since this feels
+ // like something it would be interesting to change and experiment with
+ int camera_fov = gSavedSettings.getU32("360CaptureCameraFOV");
+
+ // compose the overlay for the final web page that tells the user
+ // what level of quality the capture was taken with
+ std::string overlay_label = "'" + getSelectedQualityTooltip() + "'";
+
+ // so now our page is loaded and images are in place - call
+ // the JavaScript init script with some parameters to initialize
+ // the WebGL based preview
+ const std::string cmd = STRINGIZE(
+ "init("
+ << mOutputImageWidth
+ << ", "
+ << mOutputImageHeight
+ << ", "
+ << "'"
+ << mImageSaveDir
+ << "'"
+ << ", "
+ << camera_fov
+ << ", "
+ << LLViewerCamera::getInstance()->getYaw()
+ << ", "
+ << overlay_label
+ << ")"
+ );
+
+ // execute the command on the page
+ mWebBrowser->getMediaPlugin()->executeJavaScript(cmd);
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+}
+
+// called when the user wants to save the cube maps off to the final EQR image
+void LLFloater360Capture::onSaveLocalBtn()
+{
+ // region name and URL
+ std::string region_name; // no sensible default
+ std::string region_url("http://secondlife.com");
+ LLViewerRegion* region = gAgent.getRegion();
+ if (region)
+ {
+ // region names can (and do) contain characters that would make passing
+ // them into a JavaScript function problematic - single quotes for example
+ // so we must escape/encode both
+ region_name = region->getName();
+
+ // escaping/encoding is a minefield - let's just remove any offending characters from the region name
+ region_name.erase(std::remove(region_name.begin(), region_name.end(), '\''), region_name.end());
+ region_name.erase(std::remove(region_name.begin(), region_name.end(), '\"'), region_name.end());
+
+ // fortunately there is already an escaping function built into the SLURL generation code
+ LLSLURL slurl;
+ bool is_escaped = true;
+ LLAgentUI::buildSLURL(slurl, is_escaped);
+ region_url = slurl.getSLURLString();
+ }
+
+ // build suggested filename (the one that appears as the default
+ // in the Save dialog box)
+ const std::string suggested_filename = generate_proposed_filename();
+
+ // This string (the name of the product plus a truncated version number (no build))
+ // is used in the XMP block as the name of the generating and stitching software.
+ // We save the version number here and not in the more generic 'software' item
+ // because that might help us determine something about the image in the future.
+ const std::string client_version = STRINGIZE(
+ LLVersionInfo::instance().getChannel() <<
+ " " <<
+ LLVersionInfo::instance().getShortVersion()
+ );
+
+ // save the time the image was created. I don't know if this should be
+ // UTC/ZULU or the users' local time. It probably doesn't matter.
+ std::time_t result = std::time(nullptr);
+ std::string ctime_str = std::ctime(&result);
+ std::string time_str = ctime_str.substr(0, ctime_str.length() - 1);
+
+ // build the JavaScript data structure that is used to pass all the
+ // variables into the JavaScript function on the web page loaded into
+ // the embedded browser component of the floater.
+ const std::string xmp_details = STRINGIZE(
+ "{ " <<
+ "pano_version: '" << "2.2.1" << "', " <<
+ "software: '" << LLVersionInfo::instance().getChannel() << "', " <<
+ "capture_software: '" << client_version << "', " <<
+ "stitching_software: '" << client_version << "', " <<
+ "width: " << mOutputImageWidth << ", " <<
+ "height: " << mOutputImageHeight << ", " <<
+ "heading: " << mInitialHeadingDeg << ", " <<
+ "actual_source_image_size: " << mQualityRadioGroup->getSelectedValue().asInteger() << ", " <<
+ "scaled_source_image_size: " << mSourceImageSize << ", " <<
+ "first_photo_date: '" << time_str << "', " <<
+ "last_photo_date: '" << time_str << "', " <<
+ "region_name: '" << region_name << "', " <<
+ "region_url: '" << region_url << "', " <<
+ " }"
+ );
+
+ // build the JavaScript command to send to the web browser
+ const std::string cmd = "saveAsEqrImage(\"" + suggested_filename + "\", " + xmp_details + ")";
+
+ // send it to the browser instance, triggering the equirectangular capture
+ // process and complimentary offer to save the image
+ mWebBrowser->getMediaPlugin()->executeJavaScript(cmd);
+}
+
+// We capture all 6 images sequentially and if parts of the world are moving
+// E.G. clouds, water, objects - then we may get seams or discontinuities
+// when the images are combined to form the EQR image. This code tries to
+// stop everything so we can shoot for seamless shots. There is probably more
+// we can do here - e.g. waves in the water probably won't line up.
+void LLFloater360Capture::freezeWorld(bool enable)
+{
+ static bool clouds_scroll_paused = false;
+ if (enable)
+ {
+ // record the cloud scroll current value so we can restore it
+ clouds_scroll_paused = LLEnvironment::instance().isCloudScrollPaused();
+
+ // stop the clouds moving
+ LLEnvironment::instance().pauseCloudScroll();
+
+ // freeze all avatars
+ LLCharacter* avatarp;
+ for (std::vector<LLCharacter*>::iterator iter = LLCharacter::sInstances.begin();
+ iter != LLCharacter::sInstances.end(); ++iter)
+ {
+ avatarp = *iter;
+ mAvatarPauseHandles.push_back(avatarp->requestPause());
+ }
+
+ // freeze everything else
+ gSavedSettings.setBOOL("FreezeTime", true);
+
+ // disable particle system
+ LLViewerPartSim::getInstance()->enable(false);
+ }
+ else // turning off freeze world mode, either temporarily or not.
+ {
+ // restart the clouds moving if they were not paused before
+ // we starting using the 360 capture floater
+ if (clouds_scroll_paused == false)
+ {
+ LLEnvironment::instance().resumeCloudScroll();
+ }
+
+ // thaw all avatars
+ mAvatarPauseHandles.clear();
+
+ // thaw everything else
+ gSavedSettings.setBOOL("FreezeTime", false);
+
+ //enable particle system
+ LLViewerPartSim::getInstance()->enable(true);
+ }
+}
+
+// Build the default filename that appears in the Save dialog box. We try
+// to encode some metadata about too (region name, EQR dimensions, capture
+// time) but the user if free to replace this with anything else before
+// the images is saved.
+const std::string LLFloater360Capture::generate_proposed_filename()
+{
+ std::ostringstream filename("");
+
+ // base name
+ filename << "sl360_";
+
+ LLViewerRegion* region = gAgent.getRegion();
+ if (region)
+ {
+ // this looks complex but it's straightforward - removes all non-alpha chars from a string
+ // which in this case is the SL region name - we use it as a proposed filename but the user is free to change
+ std::string region_name = region->getName();
+ std::replace_if(region_name.begin(), region_name.end(), std::not1(std::ptr_fun(isalnum)), '_');
+ if (region_name.length() > 0)
+ {
+ filename << region_name;
+ filename << "_";
+ }
+ }
+
+ // add in resolution to make it easier to tell what you captured later
+ filename << mOutputImageWidth;
+ filename << "x";
+ filename << mOutputImageHeight;
+ filename << "_";
+
+ // Add in the size of the source image (width == height since it was square)
+ // Might be useful later for quality comparisons
+ filename << mSourceImageSize;
+ filename << "_";
+
+ // add in the current HH-MM-SS (with leading 0's) so users can easily save many shots in same folder
+ std::time_t cur_epoch = std::time(nullptr);
+ std::tm* tm_time = std::localtime(&cur_epoch);
+ filename << std::setfill('0') << std::setw(4) << (tm_time->tm_year + 1900);
+ filename << std::setfill('0') << std::setw(2) << (tm_time->tm_mon + 1);
+ filename << std::setfill('0') << std::setw(2) << tm_time->tm_mday;
+ filename << "_";
+ filename << std::setfill('0') << std::setw(2) << tm_time->tm_hour;
+ filename << std::setfill('0') << std::setw(2) << tm_time->tm_min;
+ filename << std::setfill('0') << std::setw(2) << tm_time->tm_sec;
+
+ // the unusual way we save the output image (originates in the
+ // embedded browser and not the C++ code) means that the system
+ // appends ".jpeg" to the file automatically on macOS at least,
+ // so we only need to do it ourselves for windows.
+#if LL_WINDOWS
+ filename << ".jpg";
+#endif
+
+ return filename.str();
+}
diff --git a/indra/newview/llfloater360capture.h b/indra/newview/llfloater360capture.h
new file mode 100644
index 0000000000..6da7ee074a
--- /dev/null
+++ b/indra/newview/llfloater360capture.h
@@ -0,0 +1,97 @@
+/**
+ * @file llfloater360capture.h
+ * @author Callum Prentice (callum@lindenlab.com)
+ * @brief Floater for the 360 capture feature
+ *
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_FLOATER_360CAPTURE_H
+#define LL_FLOATER_360CAPTURE_H
+
+#include "llfloater.h"
+#include "llmediactrl.h"
+#include "llcharacter.h"
+
+class LLImageRaw;
+class LLTextBox;
+class LLRadioGroup;
+
+class LLFloater360Capture:
+ public LLFloater,
+ public LLViewerMediaObserver
+{
+ friend class LLFloaterReg;
+
+ private:
+ LLFloater360Capture(const LLSD& key);
+
+ ~LLFloater360Capture();
+ BOOL postBuild() override;
+ void handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) override;
+
+ void changeInterestListMode(bool send_everything);
+
+ const std::string getHTMLBaseFolder();
+ void capture360Images();
+
+ const std::string makeFullPathToJS(const std::string filename);
+ void writeDataURLHeader(const std::string filename);
+ void writeDataURLFooter(const std::string filename);
+ bool writeDataURL(const std::string filename, const std::string prefix, U8* data, unsigned int data_len);
+ void encodeAndSave(LLPointer<LLImageRaw> raw_image, const std::string filename, const std::string prefix);
+
+ std::vector<LLAnimPauseRequest> mAvatarPauseHandles;
+ void freezeWorld(bool enable);
+
+ void mockSnapShot(LLImageRaw* raw);
+
+ void suspendForAFrame();
+
+ const std::string generate_proposed_filename();
+
+ void setSourceImageSize();
+
+ LLMediaCtrl* mWebBrowser;
+ const std::string mDefaultHTML = "default.html";
+ const std::string mEqrGenHTML = "eqr_gen.html";
+
+ LLUICtrl* mCaptureBtn;
+ void onCapture360ImagesBtn();
+
+ void onSaveLocalBtn();
+ LLUICtrl* mSaveLocalBtn;
+
+ LLRadioGroup* mQualityRadioGroup;
+ void onChooseQualityRadioGroup();
+ const std::string getSelectedQualityTooltip();
+
+ int mSourceImageSize;
+ float mInitialHeadingDeg;
+ int mOutputImageWidth;
+ int mOutputImageHeight;
+ std::string mImageSaveDir;
+
+ LLPointer<LLImageRaw> mRawImages[6];
+};
+
+#endif // LL_FLOATER_360CAPTURE_H
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
index 957b2e1e8e..9813156bf2 100644
--- a/indra/newview/llfloaterauction.cpp
+++ b/indra/newview/llfloaterauction.cpp
@@ -32,8 +32,7 @@
#include "llimagej2c.h"
#include "llimagetga.h"
#include "llparcel.h"
-#include "llvfile.h"
-#include "llvfs.h"
+#include "llfilesystem.h"
#include "llwindow.h"
#include "message.h"
@@ -202,7 +201,9 @@ void LLFloaterAuction::onClickSnapshot(void* data)
LLPointer<LLImageTGA> tga = new LLImageTGA;
tga->encode(raw);
- LLVFile::writeFile(tga->getData(), tga->getDataSize(), gVFS, self->mImageID, LLAssetType::AT_IMAGE_TGA);
+
+ LLFileSystem tga_file(self->mImageID, LLAssetType::AT_IMAGE_TGA, LLFileSystem::WRITE);
+ tga_file.write(tga->getData(), tga->getDataSize());
raw->biasedScaleToPowerOfTwo(LLViewerTexture::MAX_IMAGE_SIZE_DEFAULT);
@@ -210,7 +211,9 @@ void LLFloaterAuction::onClickSnapshot(void* data)
LLPointer<LLImageJ2C> j2c = new LLImageJ2C;
j2c->encode(raw, 0.0f);
- LLVFile::writeFile(j2c->getData(), j2c->getDataSize(), gVFS, self->mImageID, LLAssetType::AT_TEXTURE);
+
+ LLFileSystem j2c_file(self->mImageID, LLAssetType::AT_TEXTURE, LLFileSystem::WRITE);
+ j2c_file.write(j2c->getData(), j2c->getDataSize());
self->mImage = LLViewerTextureManager::getLocalTexture((LLImageRaw*)raw, FALSE);
gGL.getTexUnit(0)->bind(self->mImage);
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp
index 131d9b077b..687d820a18 100644
--- a/indra/newview/llfloaterbvhpreview.cpp
+++ b/indra/newview/llfloaterbvhpreview.cpp
@@ -32,7 +32,7 @@
#include "lldatapacker.h"
#include "lldir.h"
#include "llnotificationsutil.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "llapr.h"
#include "llstring.h"
@@ -997,10 +997,9 @@ void LLFloaterBvhPreview::onBtnOK(void* userdata)
LLDataPackerBinaryBuffer dp(buffer, file_size);
if (motionp->serialize(dp))
{
- LLVFile file(gVFS, motionp->getID(), LLAssetType::AT_ANIMATION, LLVFile::APPEND);
+ LLFileSystem file(motionp->getID(), LLAssetType::AT_ANIMATION, LLFileSystem::APPEND);
S32 size = dp.getCurrentSize();
- file.setMaxSize(size);
if (file.write((U8*)buffer, size))
{
std::string name = floaterp->getChild<LLUICtrl>("name_form")->getValue().asString();
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index d9edd4dc30..64b24d54c3 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -59,6 +59,7 @@
#include "llspinctrl.h"
#include "lltabcontainer.h"
#include "lltrans.h"
+#include "llfilesystem.h"
#include "llcallbacklist.h"
#include "llviewertexteditor.h"
#include "llviewernetwork.h"
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 82f01fb747..da01457126 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -261,7 +261,6 @@ std::string LLFloaterPreference::sSkin = "";
LLFloaterPreference::LLFloaterPreference(const LLSD& key)
: LLFloater(key),
mGotPersonalInfo(false),
- mOriginalIMViaEmail(false),
mLanguageChanged(false),
mAvatarDataInitialized(false),
mSearchDataDirty(true)
@@ -557,11 +556,9 @@ void LLFloaterPreference::apply()
if (mGotPersonalInfo)
{
- bool new_im_via_email = getChild<LLUICtrl>("send_im_to_email")->getValue().asBoolean();
bool new_hide_online = getChild<LLUICtrl>("online_visibility")->getValue().asBoolean();
- if ((new_im_via_email != mOriginalIMViaEmail)
- ||(new_hide_online != mOriginalHideOnlineStatus))
+ if (new_hide_online != mOriginalHideOnlineStatus)
{
// This hack is because we are representing several different
// possible strings with a single checkbox. Since most users
@@ -575,7 +572,7 @@ void LLFloaterPreference::apply()
//Update showonline value, otherwise multiple applys won't work
mOriginalHideOnlineStatus = new_hide_online;
}
- gAgent.sendAgentUpdateUserInfo(new_im_via_email,mDirectoryVisibility);
+ gAgent.sendAgentUpdateUserInfo(mDirectoryVisibility);
}
}
@@ -980,12 +977,12 @@ void LLFloaterPreference::onBtnCancel(const LLSD& userdata)
}
// static
-void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email, bool is_verified_email)
+void LLFloaterPreference::updateUserInfo(const std::string& visibility)
{
LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
if (instance)
{
- instance->setPersonalInfo(visibility, im_via_email, is_verified_email);
+ instance->setPersonalInfo(visibility);
}
}
@@ -1694,10 +1691,9 @@ bool LLFloaterPreference::moveTranscriptsAndLog()
return true;
}
-void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email, bool is_verified_email)
+void LLFloaterPreference::setPersonalInfo(const std::string& visibility)
{
mGotPersonalInfo = true;
- mOriginalIMViaEmail = im_via_email;
mDirectoryVisibility = visibility;
if (visibility == VISIBILITY_DEFAULT)
@@ -1719,16 +1715,7 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
getChildView("friends_online_notify_checkbox")->setEnabled(TRUE);
getChild<LLUICtrl>("online_visibility")->setValue(mOriginalHideOnlineStatus);
getChild<LLUICtrl>("online_visibility")->setLabelArg("[DIR_VIS]", mDirectoryVisibility);
- getChildView("send_im_to_email")->setEnabled(is_verified_email);
- std::string tooltip;
- if (!is_verified_email)
- tooltip = getString("email_unverified_tooltip");
-
- getChildView("send_im_to_email")->setToolTip(tooltip);
-
- // *TODO: Show or hide verify email text here based on is_verified_email
- getChild<LLUICtrl>("send_im_to_email")->setValue(im_via_email);
getChildView("favorites_on_login_check")->setEnabled(TRUE);
getChildView("log_path_button")->setEnabled(TRUE);
getChildView("chat_font_size")->setEnabled(TRUE);
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index e9e19e9acb..5ef2ca68d3 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -88,7 +88,7 @@ public:
/*virtual*/ void changed(const LLUUID& session_id, U32 mask) {};
// static data update, called from message handler
- static void updateUserInfo(const std::string& visibility, bool im_via_email, bool is_verified_email);
+ static void updateUserInfo(const std::string& visibility);
// refresh all the graphics preferences menus
static void refreshEnabledGraphics();
@@ -114,7 +114,7 @@ protected:
void onBtnOK(const LLSD& userdata);
void onBtnCancel(const LLSD& userdata);
- void onClickClearCache(); // Clear viewer texture cache, vfs, and VO cache on next startup
+ void onClickClearCache(); // Clear viewer texture cache, file cache on next startup
void onClickBrowserClearCache(); // Clear web history and caches as well as viewer caches above
void onLanguageChange();
void onNotificationsChange(const std::string& OptionName);
@@ -160,7 +160,7 @@ public:
void changeLogPath(const std::vector<std::string>& filenames, std::string proposed_name);
bool moveTranscriptsAndLog();
void enableHistory();
- void setPersonalInfo(const std::string& visibility, bool im_via_email, bool is_verified_email);
+ void setPersonalInfo(const std::string& visibility);
void refreshEnabledState();
void onCommitWindowedMode();
void refresh(); // Refresh enable/disable
@@ -206,7 +206,6 @@ private:
static std::string sSkin;
notifications_map mNotificationOptions;
bool mGotPersonalInfo;
- bool mOriginalIMViaEmail;
bool mLanguageChanged;
bool mAvatarDataInitialized;
std::string mPriorInstantMessageLogPath;
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 7beecbc810..296e155d28 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -36,7 +36,7 @@
#include "llglheaders.h"
#include "llregionflags.h"
#include "llstl.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "llxfermanager.h"
#include "indra_constants.h"
#include "message.h"
@@ -2254,10 +2254,9 @@ void LLPanelEstateCovenant::loadInvItem(LLInventoryItem *itemp)
}
// static
-void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
- LLAssetType::EType type,
- void* user_data, S32 status, LLExtStat ext_status)
+void LLPanelEstateCovenant::onLoadComplete(const LLUUID& asset_uuid,
+ LLAssetType::EType type,
+ void* user_data, S32 status, LLExtStat ext_status)
{
LL_INFOS() << "LLPanelEstateCovenant::onLoadComplete()" << LL_ENDL;
LLPanelEstateCovenant* panelp = (LLPanelEstateCovenant*)user_data;
@@ -2265,7 +2264,7 @@ void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs,
{
if(0 == status)
{
- LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
+ LLFileSystem file(asset_uuid, type, LLFileSystem::READ);
S32 file_length = file.getSize();
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index 75d0c3ea5c..c34dbb62e8 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -55,7 +55,6 @@ class LLRadioGroup;
class LLSliderCtrl;
class LLSpinCtrl;
class LLTextBox;
-class LLVFS;
class LLPanelRegionGeneralInfo;
class LLPanelRegionDebugInfo;
@@ -357,8 +356,7 @@ public:
static bool confirmResetCovenantCallback(const LLSD& notification, const LLSD& response);
void sendChangeCovenantID(const LLUUID &asset_id);
void loadInvItem(LLInventoryItem *itemp);
- static void onLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
+ static void onLoadComplete(const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index a30c73768d..b73755cf4e 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -44,8 +44,7 @@
#include "llnotificationsutil.h"
#include "llstring.h"
#include "llsys.h"
-#include "llvfile.h"
-#include "llvfs.h"
+#include "llfilesystem.h"
#include "mean_collision_data.h"
#include "message.h"
#include "v3math.h"
@@ -896,12 +895,9 @@ void LLFloaterReporter::takeScreenshot(bool use_prev_screenshot)
mResourceDatap->mAssetInfo.setName("screenshot_name");
mResourceDatap->mAssetInfo.setDescription("screenshot_descr");
- // store in VFS
- LLVFile::writeFile(upload_data->getData(),
- upload_data->getDataSize(),
- gVFS,
- mResourceDatap->mAssetInfo.mUuid,
- mResourceDatap->mAssetInfo.mType);
+ // store in cache
+ LLFileSystem j2c_file(mResourceDatap->mAssetInfo.mUuid, mResourceDatap->mAssetInfo.mType, LLFileSystem::WRITE);
+ j2c_file.write(upload_data->getData(), upload_data->getDataSize());
// store in the image list so it doesn't try to fetch from the server
LLPointer<LLViewerFetchedTexture> image_in_list =
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index ef7a9fd536..83212230e5 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -179,6 +179,10 @@ void LLFloaterSnapshotBase::ImplBase::updateLayout(LLFloaterSnapshotBase* floate
thumbnail_placeholder->reshape(panel_width, thumbnail_placeholder->getRect().getHeight());
floaterp->getChild<LLUICtrl>("image_res_text")->setVisible(mAdvanced);
floaterp->getChild<LLUICtrl>("file_size_label")->setVisible(mAdvanced);
+ if (floaterp->hasChild("360_label", TRUE))
+ {
+ floaterp->getChild<LLUICtrl>("360_label")->setVisible(mAdvanced);
+ }
if(!floaterp->isMinimized())
{
floaterp->reshape(floater_width, floaterp->getRect().getHeight());
@@ -992,6 +996,10 @@ BOOL LLFloaterSnapshot::postBuild()
getChild<LLButton>("retract_btn")->setCommitCallback(boost::bind(&LLFloaterSnapshot::onExtendFloater, this));
getChild<LLButton>("extend_btn")->setCommitCallback(boost::bind(&LLFloaterSnapshot::onExtendFloater, this));
+ getChild<LLTextBox>("360_label")->setSoundFlags(LLView::MOUSE_UP);
+ getChild<LLTextBox>("360_label")->setShowCursorHand(false);
+ getChild<LLTextBox>("360_label")->setClickedCallback(boost::bind(&LLFloaterSnapshot::on360Snapshot, this));
+
// Filters
LLComboBox* filterbox = getChild<LLComboBox>("filters_combobox");
std::vector<std::string> filter_list = LLImageFiltersManager::getInstance()->getFiltersList();
@@ -1118,6 +1126,12 @@ void LLFloaterSnapshot::onExtendFloater()
impl->setAdvanced(gSavedSettings.getBOOL("AdvanceSnapshot"));
}
+void LLFloaterSnapshot::on360Snapshot()
+{
+ LLFloaterReg::showInstance("360capture");
+ closeFloater();
+}
+
//virtual
void LLFloaterSnapshotBase::onClose(bool app_quitting)
{
diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h
index 8221b0a637..7ec133ff45 100644
--- a/indra/newview/llfloatersnapshot.h
+++ b/indra/newview/llfloatersnapshot.h
@@ -153,6 +153,7 @@ public:
static void update();
void onExtendFloater();
+ void on360Snapshot();
static LLFloaterSnapshot* getInstance();
static LLFloaterSnapshot* findInstance();
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp
index bd403f68d7..1aeb727172 100644
--- a/indra/newview/llfloatertos.cpp
+++ b/indra/newview/llfloatertos.cpp
@@ -40,7 +40,7 @@
#include "lltextbox.h"
#include "llui.h"
#include "lluictrlfactory.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "message.h"
#include "llstartup.h" // login_alert_done
#include "llcorehttputil.h"
diff --git a/indra/newview/llfloatertos.h b/indra/newview/llfloatertos.h
index 85033acf4d..7c2f0705b7 100644
--- a/indra/newview/llfloatertos.h
+++ b/indra/newview/llfloatertos.h
@@ -36,7 +36,6 @@
class LLButton;
class LLRadioGroup;
-class LLVFS;
class LLTextEditor;
class LLUUID;
diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp
index 950a6cfaef..9f2119281d 100644
--- a/indra/newview/llgesturemgr.cpp
+++ b/indra/newview/llgesturemgr.cpp
@@ -42,7 +42,7 @@
#include "llnotificationsutil.h"
#include "llstl.h"
#include "llstring.h" // todo: remove
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "message.h"
// newview
@@ -548,7 +548,7 @@ void LLGestureMgr::playGesture(LLMultiGesture* gesture)
LLGestureStepAnimation* anim_step = (LLGestureStepAnimation*)step;
const LLUUID& anim_id = anim_step->mAnimAssetID;
- // Don't request the animation if this step stops it or if it is already in Static VFS
+ // Don't request the animation if this step stops it or if it is already in the cache
if (!(anim_id.isNull()
|| anim_step->mFlags & ANIM_FLAG_STOP
|| gAssetStorage->hasLocalAsset(anim_id, LLAssetType::AT_ANIMATION)))
@@ -1038,10 +1038,9 @@ void LLGestureMgr::runStep(LLMultiGesture* gesture, LLGestureStep* step)
// static
-void LLGestureMgr::onLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
- LLAssetType::EType type,
- void* user_data, S32 status, LLExtStat ext_status)
+void LLGestureMgr::onLoadComplete(const LLUUID& asset_uuid,
+ LLAssetType::EType type,
+ void* user_data, S32 status, LLExtStat ext_status)
{
LLLoadInfo* info = (LLLoadInfo*)user_data;
@@ -1056,7 +1055,7 @@ void LLGestureMgr::onLoadComplete(LLVFS *vfs,
if (0 == status)
{
- LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
+ LLFileSystem file(asset_uuid, type, LLFileSystem::READ);
S32 size = file.getSize();
std::vector<char> buffer(size+1);
@@ -1159,8 +1158,7 @@ void LLGestureMgr::onLoadComplete(LLVFS *vfs,
}
// static
-void LLGestureMgr::onAssetLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
+void LLGestureMgr::onAssetLoadComplete(const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
@@ -1172,7 +1170,7 @@ void LLGestureMgr::onAssetLoadComplete(LLVFS *vfs,
{
case LLAssetType::AT_ANIMATION:
{
- LLKeyframeMotion::onLoadComplete(vfs, asset_uuid, type, user_data, status, ext_status);
+ LLKeyframeMotion::onLoadComplete(asset_uuid, type, user_data, status, ext_status);
self.mLoadingAssets.erase(asset_uuid);
@@ -1180,7 +1178,7 @@ void LLGestureMgr::onAssetLoadComplete(LLVFS *vfs,
}
case LLAssetType::AT_SOUND:
{
- LLAudioEngine::assetCallback(vfs, asset_uuid, type, user_data, status, ext_status);
+ LLAudioEngine::assetCallback(asset_uuid, type, user_data, status, ext_status);
self.mLoadingAssets.erase(asset_uuid);
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h
index 402bdf6039..91ab445273 100644
--- a/indra/newview/llgesturemgr.h
+++ b/indra/newview/llgesturemgr.h
@@ -40,7 +40,6 @@ class LLMultiGesture;
class LLGestureListener;
class LLGestureStep;
class LLUUID;
-class LLVFS;
class LLGestureManagerObserver
{
@@ -154,15 +153,13 @@ protected:
void done();
// Used by loadGesture
- static void onLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
- LLAssetType::EType type,
- void* user_data, S32 status, LLExtStat ext_status);
+ static void onLoadComplete(const LLUUID& asset_uuid,
+ LLAssetType::EType type,
+ void* user_data, S32 status, LLExtStat ext_status);
// Used by playGesture to load an asset file
// required to play a gesture step
- static void onAssetLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
+ static void onAssetLoadComplete(const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
diff --git a/indra/newview/lllandmarklist.cpp b/indra/newview/lllandmarklist.cpp
index 9106d4e986..31e76267e6 100644
--- a/indra/newview/lllandmarklist.cpp
+++ b/indra/newview/lllandmarklist.cpp
@@ -33,7 +33,7 @@
#include "llappviewer.h"
#include "llagent.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "llviewerstats.h"
// Globals
@@ -124,7 +124,6 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t
// static
void LLLandmarkList::processGetAssetReply(
- LLVFS *vfs,
const LLUUID& uuid,
LLAssetType::EType type,
void* user_data,
@@ -133,7 +132,7 @@ void LLLandmarkList::processGetAssetReply(
{
if( status == 0 )
{
- LLVFile file(vfs, uuid, type);
+ LLFileSystem file(uuid, type);
S32 file_length = file.getSize();
if (file_length > 0)
diff --git a/indra/newview/lllandmarklist.h b/indra/newview/lllandmarklist.h
index 4f3b11660d..f5fa958204 100644
--- a/indra/newview/lllandmarklist.h
+++ b/indra/newview/lllandmarklist.h
@@ -52,7 +52,6 @@ public:
BOOL assetExists(const LLUUID& asset_uuid);
LLLandmark* getAsset(const LLUUID& asset_uuid, loaded_callback_t cb = NULL);
static void processGetAssetReply(
- LLVFS *vfs,
const LLUUID& uuid,
LLAssetType::EType type,
void* user_data,
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 2c1c1191da..8080e43383 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -49,7 +49,7 @@
#include "llsdutil_math.h"
#include "llsdserialize.h"
#include "llthread.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "llviewercontrol.h"
#include "llviewerinventory.h"
#include "llviewermenufile.h"
@@ -294,8 +294,6 @@
// * Header parse failures come without much explanation. Elaborate.
// * Work queue for uploads? Any need for this or is the current scheme good
// enough?
-// * Various temp buffers used in VFS I/O might be allocated once or even
-// statically. Look for some wins here.
// * Move data structures holding mesh data used by main thread into main-
// thread-only access so that no locking is needed. May require duplication
// of some data so that worker thread has a minimal data set to guide
@@ -1336,8 +1334,8 @@ bool LLMeshRepoThread::fetchMeshSkinInfo(const LLUUID& mesh_id)
if (version <= MAX_MESH_VERSION && offset >= 0 && size > 0)
{
- //check VFS for mesh skin info
- LLVFile file(gVFS, mesh_id, LLAssetType::AT_MESH);
+ //check cache for mesh skin info
+ LLFileSystem file(mesh_id, LLAssetType::AT_MESH);
if (file.getSize() >= offset+size)
{
U8* buffer = new(std::nothrow) U8[size];
@@ -1370,7 +1368,7 @@ bool LLMeshRepoThread::fetchMeshSkinInfo(const LLUUID& mesh_id)
delete[] buffer;
}
- //reading from VFS failed for whatever reason, fetch from sim
+ //reading from cache failed for whatever reason, fetch from sim
std::string http_url;
constructUrl(mesh_id, &http_url);
@@ -1432,8 +1430,8 @@ bool LLMeshRepoThread::fetchMeshDecomposition(const LLUUID& mesh_id)
if (version <= MAX_MESH_VERSION && offset >= 0 && size > 0)
{
- //check VFS for mesh skin info
- LLVFile file(gVFS, mesh_id, LLAssetType::AT_MESH);
+ //check cache for mesh skin info
+ LLFileSystem file(mesh_id, LLAssetType::AT_MESH);
if (file.getSize() >= offset+size)
{
U8* buffer = new(std::nothrow) U8[size];
@@ -1467,7 +1465,7 @@ bool LLMeshRepoThread::fetchMeshDecomposition(const LLUUID& mesh_id)
delete[] buffer;
}
- //reading from VFS failed for whatever reason, fetch from sim
+ //reading from cache failed for whatever reason, fetch from sim
std::string http_url;
constructUrl(mesh_id, &http_url);
@@ -1529,8 +1527,8 @@ bool LLMeshRepoThread::fetchMeshPhysicsShape(const LLUUID& mesh_id)
if (version <= MAX_MESH_VERSION && offset >= 0 && size > 0)
{
- //check VFS for mesh physics shape info
- LLVFile file(gVFS, mesh_id, LLAssetType::AT_MESH);
+ //check cache for mesh physics shape info
+ LLFileSystem file(mesh_id, LLAssetType::AT_MESH);
if (file.getSize() >= offset+size)
{
LLMeshRepository::sCacheBytesRead += size;
@@ -1563,7 +1561,7 @@ bool LLMeshRepoThread::fetchMeshPhysicsShape(const LLUUID& mesh_id)
delete[] buffer;
}
- //reading from VFS failed for whatever reason, fetch from sim
+ //reading from cache failed for whatever reason, fetch from sim
std::string http_url;
constructUrl(mesh_id, &http_url);
@@ -1634,8 +1632,8 @@ bool LLMeshRepoThread::fetchMeshHeader(const LLVolumeParams& mesh_params, bool c
++LLMeshRepository::sMeshRequestCount;
{
- //look for mesh in asset in vfs
- LLVFile file(gVFS, mesh_params.getSculptID(), LLAssetType::AT_MESH);
+ //look for mesh in asset in cache
+ LLFileSystem file(mesh_params.getSculptID(), LLAssetType::AT_MESH);
S32 size = file.getSize();
@@ -1649,7 +1647,11 @@ bool LLMeshRepoThread::fetchMeshHeader(const LLVolumeParams& mesh_params, bool c
file.read(buffer, bytes);
if (headerReceived(mesh_params, buffer, bytes) == MESH_OK)
{
- // Found mesh in VFS cache
+ std::string mid;
+ mesh_params.getSculptID().toString(mid);
+ LL_DEBUGS(LOG_MESH) << "Mesh/Cache: Mesh header for ID " << mid << " - was retrieved from the cache." << LL_ENDL;
+
+ // Found mesh in cache
return true;
}
}
@@ -1660,8 +1662,13 @@ bool LLMeshRepoThread::fetchMeshHeader(const LLVolumeParams& mesh_params, bool c
std::string http_url;
constructUrl(mesh_params.getSculptID(), &http_url);
+
if (!http_url.empty())
{
+ std::string mid;
+ mesh_params.getSculptID().toString(mid);
+ LL_DEBUGS(LOG_MESH) << "Mesh/Cache: Mesh header for ID " << mid << " - was retrieved from the simulator." << LL_ENDL;
+
//grab first 4KB if we're going to bother with a fetch. Cache will prevent future fetches if a full mesh fits
//within the first 4KB
//NOTE -- this will break of headers ever exceed 4KB
@@ -1713,8 +1720,8 @@ bool LLMeshRepoThread::fetchMeshLOD(const LLVolumeParams& mesh_params, S32 lod,
if (version <= MAX_MESH_VERSION && offset >= 0 && size > 0)
{
- //check VFS for mesh asset
- LLVFile file(gVFS, mesh_id, LLAssetType::AT_MESH);
+ //check cache for mesh asset
+ LLFileSystem file(mesh_id, LLAssetType::AT_MESH);
if (file.getSize() >= offset+size)
{
U8* buffer = new(std::nothrow) U8[size];
@@ -1742,6 +1749,11 @@ bool LLMeshRepoThread::fetchMeshLOD(const LLVolumeParams& mesh_params, S32 lod,
if (lodReceived(mesh_params, lod, buffer, size) == MESH_OK)
{
delete[] buffer;
+
+ std::string mid;
+ mesh_id.toString(mid);
+ LL_DEBUGS(LOG_MESH) << "Mesh/Cache: Mesh body for ID " << mid << " - was retrieved from the cache." << LL_ENDL;
+
return true;
}
}
@@ -1749,12 +1761,16 @@ bool LLMeshRepoThread::fetchMeshLOD(const LLVolumeParams& mesh_params, S32 lod,
delete[] buffer;
}
- //reading from VFS failed for whatever reason, fetch from sim
+ //reading from cache failed for whatever reason, fetch from sim
std::string http_url;
constructUrl(mesh_id, &http_url);
-
+
if (!http_url.empty())
{
+ std::string mid;
+ mesh_id.toString(mid);
+ LL_DEBUGS(LOG_MESH) << "Mesh/Cache: Mesh body for ID " << mid << " - was retrieved from the simulator." << LL_ENDL;
+
LLMeshHandlerBase::ptr_t handler(new LLMeshLODHandler(mesh_params, lod, offset, size));
LLCore::HttpHandle handle = getByteRange(http_url, offset, size, handler);
if (LLCORE_HTTP_HANDLE_INVALID == handle)
@@ -3208,7 +3224,7 @@ void LLMeshHeaderHandler::processData(LLCore::BufferArray * /* body */, S32 /* b
}
else if (data && data_size > 0)
{
- // header was successfully retrieved from sim and parsed, cache in vfs
+ // header was successfully retrieved from sim and parsed and is in cache
S32 header_bytes = 0;
LLSD header;
@@ -3247,31 +3263,32 @@ void LLMeshHeaderHandler::processData(LLCore::BufferArray * /* body */, S32 /* b
// It's possible for the remote asset to have more data than is needed for the local cache
- // only allocate as much space in the VFS as is needed for the local cache
+ // only allocate as much space in the cache as is needed for the local cache
data_size = llmin(data_size, bytes);
- LLVFile file(gVFS, mesh_id, LLAssetType::AT_MESH, LLVFile::WRITE);
- if (file.getMaxSize() >= bytes || file.setMaxSize(bytes))
+ // <FS:Ansariel> Fix asset caching
+ //LLFileSystem file(mesh_id, LLAssetType::AT_MESH, LLFileSystem::WRITE);
+ LLFileSystem file(mesh_id, LLAssetType::AT_MESH, LLFileSystem::READ_WRITE);
+ if (file.getMaxSize() >= bytes)
{
LLMeshRepository::sCacheBytesWritten += data_size;
++LLMeshRepository::sCacheWrites;
file.write(data, data_size);
-
- // zero out the rest of the file
- U8 block[MESH_HEADER_SIZE];
- memset(block, 0, sizeof(block));
- while (bytes-file.tell() > sizeof(block))
- {
- file.write(block, sizeof(block));
- }
-
- S32 remaining = bytes-file.tell();
+ // <FS:Ansariel> Fix asset caching
+ S32 remaining = bytes - file.tell();
if (remaining > 0)
{
- file.write(block, remaining);
+ U8* block = new(std::nothrow) U8[remaining];
+ if (block)
+ {
+ memset(block, 0, remaining);
+ file.write(block, remaining);
+ delete[] block;
+ }
}
+ // </FS:Ansariel>
}
}
else
@@ -3323,8 +3340,10 @@ void LLMeshLODHandler::processData(LLCore::BufferArray * /* body */, S32 /* body
EMeshProcessingResult result = gMeshRepo.mThread->lodReceived(mMeshParams, mLOD, data, data_size);
if (result == MESH_OK)
{
- // good fetch from sim, write to VFS for caching
- LLVFile file(gVFS, mMeshParams.getSculptID(), LLAssetType::AT_MESH, LLVFile::WRITE);
+ // good fetch from sim, write to cache
+ // <FS:Ansariel> Fix asset caching
+ //LLFileSystem file(mMeshParams.getSculptID(), LLAssetType::AT_MESH, LLFileSystem::WRITE);
+ LLFileSystem file(mMeshParams.getSculptID(), LLAssetType::AT_MESH, LLFileSystem::READ_WRITE);
S32 offset = mOffset;
S32 size = mRequestedBytes;
@@ -3387,8 +3406,10 @@ void LLMeshSkinInfoHandler::processData(LLCore::BufferArray * /* body */, S32 /*
&& ((data != NULL) == (data_size > 0)) // if we have data but no size or have size but no data, something is wrong
&& gMeshRepo.mThread->skinInfoReceived(mMeshID, data, data_size))
{
- // good fetch from sim, write to VFS for caching
- LLVFile file(gVFS, mMeshID, LLAssetType::AT_MESH, LLVFile::WRITE);
+ // good fetch from sim, write to cache
+ // <FS:Ansariel> Fix asset caching
+ //LLFileSystem file(mMeshID, LLAssetType::AT_MESH, LLFileSystem::WRITE);
+ LLFileSystem file(mMeshID, LLAssetType::AT_MESH, LLFileSystem::READ_WRITE);
S32 offset = mOffset;
S32 size = mRequestedBytes;
@@ -3435,8 +3456,10 @@ void LLMeshDecompositionHandler::processData(LLCore::BufferArray * /* body */, S
&& ((data != NULL) == (data_size > 0)) // if we have data but no size or have size but no data, something is wrong
&& gMeshRepo.mThread->decompositionReceived(mMeshID, data, data_size))
{
- // good fetch from sim, write to VFS for caching
- LLVFile file(gVFS, mMeshID, LLAssetType::AT_MESH, LLVFile::WRITE);
+ // good fetch from sim, write to cache
+ // <FS:Ansariel> Fix asset caching
+ //LLFileSystem file(mMeshID, LLAssetType::AT_MESH, LLFileSystem::WRITE);
+ LLFileSystem file(mMeshID, LLAssetType::AT_MESH, LLFileSystem::READ_WRITE);
S32 offset = mOffset;
S32 size = mRequestedBytes;
@@ -3482,8 +3505,10 @@ void LLMeshPhysicsShapeHandler::processData(LLCore::BufferArray * /* body */, S3
&& ((data != NULL) == (data_size > 0)) // if we have data but no size or have size but no data, something is wrong
&& gMeshRepo.mThread->physicsShapeReceived(mMeshID, data, data_size) == MESH_OK)
{
- // good fetch from sim, write to VFS for caching
- LLVFile file(gVFS, mMeshID, LLAssetType::AT_MESH, LLVFile::WRITE);
+ // good fetch from sim, write to cache for caching
+ // <FS:Ansariel> Fix asset caching
+ //LLFileSystem file(mMeshID, LLAssetType::AT_MESH, LLFileSystem::WRITE);
+ LLFileSystem file(mMeshID, LLAssetType::AT_MESH, LLFileSystem::READ_WRITE);
S32 offset = mOffset;
S32 size = mRequestedBytes;
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 81e49cb1d8..441264d42f 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -48,7 +48,6 @@
class LLVOVolume;
class LLMutex;
class LLCondition;
-class LLVFS;
class LLMeshRepository;
typedef enum e_mesh_processing_result_enum
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 6a1597fad5..1f7bfbbf8a 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -32,7 +32,7 @@
// llcommon
#include "llcommonutils.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "llaccordionctrltab.h"
#include "llappearancemgr.h"
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index 6dd8a6298f..ce5c090134 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -38,7 +38,6 @@
#include <vector>
-class LLVFS;
class LLOutfitGallery;
class LLOutfitGalleryItem;
class LLOutfitListGearMenuBase;
diff --git a/indra/newview/llpostcard.cpp b/indra/newview/llpostcard.cpp
index d5775042c1..071fc31d27 100644
--- a/indra/newview/llpostcard.cpp
+++ b/indra/newview/llpostcard.cpp
@@ -28,8 +28,7 @@
#include "llpostcard.h"
-#include "llvfile.h"
-#include "llvfs.h"
+#include "llfilesystem.h"
#include "llviewerregion.h"
#include "message.h"
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp
index d81f8a5ada..33b7b03654 100644
--- a/indra/newview/llpreviewgesture.cpp
+++ b/indra/newview/llpreviewgesture.cpp
@@ -30,7 +30,7 @@
#include "llagent.h"
#include "llanimstatelabels.h"
#include "llanimationstates.h"
-#include "llappviewer.h" // gVFS
+#include "llappviewer.h"
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "lldatapacker.h"
@@ -47,7 +47,7 @@
#include "llradiogroup.h"
#include "llresmgr.h"
#include "lltrans.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "llviewerobjectlist.h"
#include "llviewerregion.h"
#include "llviewerstats.h"
@@ -835,10 +835,9 @@ void LLPreviewGesture::loadAsset()
// static
-void LLPreviewGesture::onLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
- LLAssetType::EType type,
- void* user_data, S32 status, LLExtStat ext_status)
+void LLPreviewGesture::onLoadComplete(const LLUUID& asset_uuid,
+ LLAssetType::EType type,
+ void* user_data, S32 status, LLExtStat ext_status)
{
LLUUID* item_idp = (LLUUID*)user_data;
@@ -847,7 +846,7 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs,
{
if (0 == status)
{
- LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
+ LLFileSystem file(asset_uuid, type, LLFileSystem::READ);
S32 size = file.getSize();
std::vector<char> buffer(size+1);
@@ -1136,10 +1135,9 @@ void LLPreviewGesture::saveIfNeeded()
tid.generate();
assetId = tid.makeAssetID(gAgent.getSecureSessionID());
- LLVFile file(gVFS, assetId, LLAssetType::AT_GESTURE, LLVFile::APPEND);
+ LLFileSystem file(assetId, LLAssetType::AT_GESTURE, LLFileSystem::APPEND);
S32 size = dp.getCurrentSize();
- file.setMaxSize(size);
file.write((U8*)buffer, size);
LLLineEditor* descEditor = getChild<LLLineEditor>("desc");
diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h
index ffcada4cc2..f5c47d71b8 100644
--- a/indra/newview/llpreviewgesture.h
+++ b/indra/newview/llpreviewgesture.h
@@ -39,7 +39,6 @@ class LLScrollListCtrl;
class LLScrollListItem;
class LLButton;
class LLRadioGroup;
-class LLVFS;
class LLPreviewGesture : public LLPreview
{
@@ -80,8 +79,7 @@ protected:
void loadAsset();
- static void onLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
+ static void onLoadComplete(const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index 59be35fe92..230def5362 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -46,7 +46,7 @@
#include "llselectmgr.h"
#include "lltrans.h"
#include "llviewertexteditor.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "llviewerinventory.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
@@ -352,8 +352,7 @@ void LLPreviewNotecard::loadAsset()
}
// static
-void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
+void LLPreviewNotecard::onLoadComplete(const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
@@ -364,7 +363,7 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
{
if(0 == status)
{
- LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
+ LLFileSystem file(asset_uuid, type, LLFileSystem::READ);
S32 file_length = file.getSize();
@@ -471,7 +470,7 @@ void LLPreviewNotecard::finishInventoryUpload(LLUUID itemId, LLUUID newAssetId,
LLPreviewNotecard* nc = LLFloaterReg::findTypedInstance<LLPreviewNotecard>("preview_notecard", LLSD(itemId));
if (nc)
{
- // *HACK: we have to delete the asset in the VFS so
+ // *HACK: we have to delete the asset in the cache so
// that the viewer will redownload it. This is only
// really necessary if the asset had to be modified by
// the uploader, so this can be optimized away in some
@@ -479,7 +478,7 @@ void LLPreviewNotecard::finishInventoryUpload(LLUUID itemId, LLUUID newAssetId,
// script actually changed the asset.
if (nc->hasEmbeddedInventory())
{
- gVFS->removeFile(newAssetId, LLAssetType::AT_NOTECARD);
+ LLFileSystem::removeFile(newAssetId, LLAssetType::AT_NOTECARD);
}
if (newItemId.isNull())
{
@@ -504,7 +503,7 @@ void LLPreviewNotecard::finishTaskUpload(LLUUID itemId, LLUUID newAssetId, LLUUI
{
if (nc->hasEmbeddedInventory())
{
- gVFS->removeFile(newAssetId, LLAssetType::AT_NOTECARD);
+ LLFileSystem::removeFile(newAssetId, LLAssetType::AT_NOTECARD);
}
nc->setAssetId(newAssetId);
nc->refreshFromInventory();
@@ -583,14 +582,13 @@ bool LLPreviewNotecard::saveIfNeeded(LLInventoryItem* copyitem, bool sync)
tid.generate();
asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
- LLVFile file(gVFS, asset_id, LLAssetType::AT_NOTECARD, LLVFile::APPEND);
+ LLFileSystem file(asset_id, LLAssetType::AT_NOTECARD, LLFileSystem::APPEND);
LLSaveNotecardInfo* info = new LLSaveNotecardInfo(this, mItemUUID, mObjectUUID,
tid, copyitem);
S32 size = buffer.length() + 1;
- file.setMaxSize(size);
file.write((U8*)buffer.c_str(), size);
gAssetStorage->storeAssetData(tid, LLAssetType::AT_NOTECARD,
diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h
index 3a706b8645..321f44a1ea 100644
--- a/indra/newview/llpreviewnotecard.h
+++ b/indra/newview/llpreviewnotecard.h
@@ -89,8 +89,7 @@ protected:
void deleteNotecard();
- static void onLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
+ static void onLoadComplete(const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index f13910cde5..a32dc8beda 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -51,7 +51,7 @@
#include "llsdserialize.h"
#include "llslider.h"
#include "lltooldraganddrop.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "llagent.h"
#include "llmenugl.h"
@@ -1714,8 +1714,11 @@ void LLPreviewLSL::saveIfNeeded(bool sync /*= true*/)
{
std::string buffer(mScriptEd->mEditor->getText());
+ LLUUID old_asset_id = inv_item->getAssetUUID().isNull() ? mScriptEd->getAssetID() : inv_item->getAssetUUID();
+
LLResourceUploadInfo::ptr_t uploadInfo(std::make_shared<LLScriptAssetUpload>(mItemUUID, buffer,
- [](LLUUID itemId, LLUUID, LLUUID, LLSD response) {
+ [old_asset_id](LLUUID itemId, LLUUID, LLUUID, LLSD response) {
+ LLFileSystem::removeFile(old_asset_id, LLAssetType::AT_LSL_TEXT);
LLPreviewLSL::finishedLSLUpload(itemId, response);
}));
@@ -1725,8 +1728,8 @@ void LLPreviewLSL::saveIfNeeded(bool sync /*= true*/)
}
// static
-void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type,
- void* user_data, S32 status, LLExtStat ext_status)
+void LLPreviewLSL::onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type,
+ void* user_data, S32 status, LLExtStat ext_status)
{
LL_DEBUGS() << "LLPreviewLSL::onLoadComplete: got uuid " << asset_uuid
<< LL_ENDL;
@@ -1736,7 +1739,7 @@ void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAsset
{
if(0 == status)
{
- LLVFile file(vfs, asset_uuid, type);
+ LLFileSystem file(asset_uuid, type);
S32 file_length = file.getSize();
std::vector<char> buffer(file_length+1);
@@ -1763,6 +1766,7 @@ void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAsset
}
preview->mScriptEd->setScriptName(script_name);
preview->mScriptEd->setEnableEditing(is_modifiable);
+ preview->mScriptEd->setAssetID(asset_uuid);
preview->mAssetStatus = PREVIEW_ASSET_LOADED;
}
else
@@ -1999,7 +2003,7 @@ void LLLiveLSLEditor::loadAsset()
}
// static
-void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
+void LLLiveLSLEditor::onLoadComplete(const LLUUID& asset_id,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status)
{
@@ -2013,9 +2017,10 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
{
if( LL_ERR_NOERR == status )
{
- instance->loadScriptText(vfs, asset_id, type);
+ instance->loadScriptText(asset_id, type);
instance->mScriptEd->setEnableEditing(TRUE);
instance->mAssetStatus = PREVIEW_ASSET_LOADED;
+ instance->mScriptEd->setAssetID(asset_id);
}
else
{
@@ -2039,9 +2044,9 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
delete floater_key;
}
-void LLLiveLSLEditor::loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type)
+void LLLiveLSLEditor::loadScriptText(const LLUUID &uuid, LLAssetType::EType type)
{
- LLVFile file(vfs, uuid, type);
+ LLFileSystem file(uuid, type);
S32 file_length = file.getSize();
std::vector<char> buffer(file_length + 1);
file.read((U8*)&buffer[0], file_length);
@@ -2195,6 +2200,7 @@ void LLLiveLSLEditor::finishLSLUpload(LLUUID itemId, LLUUID taskId, LLUUID newAs
if (preview)
{
preview->mItem->setAssetUUID(newAssetId);
+ preview->mScriptEd->setAssetID(newAssetId);
// Bytecode save completed
if (response["compiled"])
@@ -2265,12 +2271,14 @@ void LLLiveLSLEditor::saveIfNeeded(bool sync /*= true*/)
if (!url.empty())
{
std::string buffer(mScriptEd->mEditor->getText());
+ LLUUID old_asset_id = mScriptEd->getAssetID();
LLResourceUploadInfo::ptr_t uploadInfo(std::make_shared<LLScriptAssetUpload>(mObjectUUID, mItemUUID,
monoChecked() ? LLScriptAssetUpload::MONO : LLScriptAssetUpload::LSL2,
isRunning, mScriptEd->getAssociatedExperience(), buffer,
- [isRunning](LLUUID itemId, LLUUID taskId, LLUUID newAssetId, LLSD response) {
- LLLiveLSLEditor::finishLSLUpload(itemId, taskId, newAssetId, response, isRunning);
+ [isRunning, old_asset_id](LLUUID itemId, LLUUID taskId, LLUUID newAssetId, LLSD response) {
+ LLFileSystem::removeFile(old_asset_id, LLAssetType::AT_LSL_TEXT);
+ LLLiveLSLEditor::finishLSLUpload(itemId, taskId, newAssetId, response, isRunning);
}));
LLViewerAssetUpload::EnqueueInventoryUpload(url, uploadInfo);
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index c1fea31063..f851ff6f3f 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -48,7 +48,6 @@ struct LLEntryAndEdCore;
class LLMenuBarGL;
class LLFloaterScriptSearch;
class LLKeywordToken;
-class LLVFS;
class LLViewerInventoryItem;
class LLScriptEdContainer;
class LLFloaterGotoLine;
@@ -143,6 +142,9 @@ public:
void setItemRemoved(bool script_removed){mScriptRemoved = script_removed;};
+ void setAssetID( const LLUUID& asset_id){ mAssetID = asset_id; };
+ LLUUID getAssetID() { return mAssetID; }
+
private:
void onBtnDynamicHelp();
void onBtnUndoChanges();
@@ -188,6 +190,7 @@ private:
LLUUID mAssociatedExperience;
BOOL mScriptRemoved;
BOOL mSaveDialogShown;
+ LLUUID mAssetID;
LLScriptEdContainer* mContainer; // parent view
@@ -234,7 +237,7 @@ protected:
static void onLoad(void* userdata);
static void onSave(void* userdata, BOOL close_after_save);
- static void onLoadComplete(LLVFS *vfs, const LLUUID& uuid,
+ static void onLoadComplete(const LLUUID& uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
@@ -295,13 +298,13 @@ private:
static void onLoad(void* userdata);
static void onSave(void* userdata, BOOL close_after_save);
- static void onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid,
+ static void onLoadComplete(const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
static void onRunningCheckboxClicked(LLUICtrl*, void* userdata);
static void onReset(void* userdata);
- void loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type);
+ void loadScriptText(const LLUUID &uuid, LLAssetType::EType type);
static void onErrorList(LLUICtrl*, void* user_data);
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp
index 5991d4073f..255ce1859a 100644
--- a/indra/newview/llsettingsvo.cpp
+++ b/indra/newview/llsettingsvo.cpp
@@ -57,7 +57,7 @@
#include "llinventorymodel.h"
#include "llassetstorage.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "lldrawpoolwater.h"
#include <boost/algorithm/string/replace.hpp>
@@ -292,18 +292,18 @@ void LLSettingsVOBase::onTaskAssetUploadComplete(LLUUID itemId, LLUUID taskId, L
void LLSettingsVOBase::getSettingsAsset(const LLUUID &assetId, LLSettingsVOBase::asset_download_fn callback)
{
gAssetStorage->getAssetData(assetId, LLAssetType::AT_SETTINGS,
- [callback](LLVFS *vfs, const LLUUID &asset_id, LLAssetType::EType, void *, S32 status, LLExtStat ext_status)
- { onAssetDownloadComplete(vfs, asset_id, status, ext_status, callback); },
+ [callback](const LLUUID &asset_id, LLAssetType::EType, void *, S32 status, LLExtStat ext_status)
+ { onAssetDownloadComplete(asset_id, status, ext_status, callback); },
nullptr, true);
}
-void LLSettingsVOBase::onAssetDownloadComplete(LLVFS *vfs, const LLUUID &asset_id, S32 status, LLExtStat ext_status, LLSettingsVOBase::asset_download_fn callback)
+void LLSettingsVOBase::onAssetDownloadComplete(const LLUUID &asset_id, S32 status, LLExtStat ext_status, LLSettingsVOBase::asset_download_fn callback)
{
LLSettingsBase::ptr_t settings;
if (!status)
{
- LLVFile file(vfs, asset_id, LLAssetType::AT_SETTINGS, LLVFile::READ);
+ LLFileSystem file(asset_id, LLAssetType::AT_SETTINGS, LLFileSystem::READ);
S32 size = file.getSize();
std::string buffer(size + 1, '\0');
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h
index 65136ad2f5..a1baf02fe7 100644
--- a/indra/newview/llsettingsvo.h
+++ b/indra/newview/llsettingsvo.h
@@ -38,7 +38,6 @@
#include "llextendedstatus.h"
#include <boost/signals2.hpp>
-class LLVFS;
class LLInventoryItem;
class LLGLSLShader;
@@ -81,7 +80,7 @@ private:
static void onAgentAssetUploadComplete(LLUUID itemId, LLUUID newAssetId, LLUUID newItemId, LLSD response, LLSettingsBase::ptr_t psettings, inventory_result_fn callback);
static void onTaskAssetUploadComplete(LLUUID itemId, LLUUID taskId, LLUUID newAssetId, LLSD response, LLSettingsBase::ptr_t psettings, inventory_result_fn callback);
- static void onAssetDownloadComplete(LLVFS *vfs, const LLUUID &asset_id, S32 status, LLExtStat ext_status, asset_download_fn callback);
+ static void onAssetDownloadComplete(const LLUUID &asset_id, S32 status, LLExtStat ext_status, asset_download_fn callback);
};
//=========================================================================
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index 8369def968..8134187c21 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -31,6 +31,7 @@
#include "llagentbenefits.h"
#include "llagentcamera.h"
#include "llagentui.h"
+#include "llfilesystem.h"
#include "llcombobox.h"
#include "llfloaterperms.h"
#include "llfloaterreg.h"
@@ -50,8 +51,6 @@
#include "llviewercontrol.h"
#include "llviewermenufile.h" // upload_new_resource()
#include "llviewerstats.h"
-#include "llvfile.h"
-#include "llvfs.h"
#include "llwindow.h"
#include "llworld.h"
#include <boost/filesystem.hpp>
@@ -1006,7 +1005,8 @@ void LLSnapshotLivePreview::saveTexture(BOOL outfit_snapshot, std::string name)
if (formatted->encode(scaled, 0.0f))
{
- LLVFile::writeFile(formatted->getData(), formatted->getDataSize(), gVFS, new_asset_id, LLAssetType::AT_TEXTURE);
+ LLFileSystem fmt_file(new_asset_id, LLAssetType::AT_TEXTURE, LLFileSystem::WRITE);
+ fmt_file.write(formatted->getData(), formatted->getDataSize());
std::string pos_string;
LLAgentUI::buildLocationString(pos_string, LLAgentUI::LOCATION_FORMAT_FULL);
std::string who_took_it;
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index b663973d4c..d9dc93aad6 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -82,7 +82,6 @@
#include "llversioninfo.h"
#include "llviewercontrol.h"
#include "llviewerhelp.h"
-#include "llvfs.h"
#include "llxorcipher.h" // saved password, MAC address
#include "llwindow.h"
#include "message.h"
@@ -271,7 +270,7 @@ bool login_alert_status(const LLSD& notification, const LLSD& response);
void login_packet_failed(void**, S32 result);
void use_circuit_callback(void**, S32 result);
void register_viewer_callbacks(LLMessageSystem* msg);
-void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32);
+void asset_callback_nothing(const LLUUID&, LLAssetType::EType, void*, S32);
bool callback_choose_gender(const LLSD& notification, const LLSD& response);
void init_start_screen(S32 location_id);
void release_start_screen();
@@ -585,7 +584,7 @@ bool idle_startup()
// start the xfer system. by default, choke the downloads
// a lot...
const S32 VIEWER_MAX_XFER = 3;
- start_xfer_manager(gVFS);
+ start_xfer_manager();
gXferManager->setMaxIncomingXfers(VIEWER_MAX_XFER);
F32 xfer_throttle_bps = gSavedSettings.getF32("XferThrottle");
if (xfer_throttle_bps > 1.f)
@@ -593,7 +592,7 @@ bool idle_startup()
gXferManager->setUseAckThrottling(TRUE);
gXferManager->setAckThrottleBPS(xfer_throttle_bps);
}
- gAssetStorage = new LLViewerAssetStorage(msg, gXferManager, gVFS, gStaticVFS);
+ gAssetStorage = new LLViewerAssetStorage(msg, gXferManager);
F32 dropPercent = gSavedSettings.getF32("PacketDropPercentage");
@@ -1009,13 +1008,6 @@ bool idle_startup()
gViewerWindow->revealIntroPanel();
- // Poke the VFS, which could potentially block for a while if
- // Windows XP is acting up
- set_startup_status(0.07f, LLTrans::getString("LoginVerifyingCache"), LLStringUtil::null);
- display_startup();
-
- gVFS->pokeFiles();
-
LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
return FALSE;
@@ -2630,7 +2622,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
msg->setHandlerFuncFast(_PREHASH_FeatureDisabled, process_feature_disabled_message);
}
-void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32)
+void asset_callback_nothing(const LLUUID&, LLAssetType::EType, void*, S32)
{
// nothing
}
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index a9f19dc32d..d4fc6f3de2 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -55,6 +55,7 @@ const S32 TEXTURE_FAST_CACHE_ENTRY_OVERHEAD = sizeof(S32) * 4; //w, h, c, level
const S32 TEXTURE_FAST_CACHE_DATA_SIZE = 16 * 16 * 4;
const S32 TEXTURE_FAST_CACHE_ENTRY_SIZE = TEXTURE_FAST_CACHE_DATA_SIZE + TEXTURE_FAST_CACHE_ENTRY_OVERHEAD;
const F32 TEXTURE_LAZY_PURGE_TIME_LIMIT = .004f; // 4ms. Would be better to autoadjust, but there is a major cache rework in progress.
+const F32 TEXTURE_PRUNING_MAX_TIME = 15.f;
class LLTextureCacheWorker : public LLWorkerClass
{
@@ -1551,7 +1552,6 @@ void LLTextureCache::readHeaderCache()
if (num_entries - empty_entries > sCacheMaxEntries)
{
// Special case: cache size was reduced, need to remove entries
- // Note: After we prune entries, we will call this again and create the LRU
U32 entries_to_purge = (num_entries - empty_entries) - sCacheMaxEntries;
LL_INFOS() << "Texture Cache Entries: " << num_entries << " Max: " << sCacheMaxEntries << " Empty: " << empty_entries << " Purging: " << entries_to_purge << LL_ENDL;
// We can exit the following loop with the given condition, since if we'd reach the end of the lru set we'd have:
@@ -1564,7 +1564,7 @@ void LLTextureCache::readHeaderCache()
++iter;
}
}
- else
+
{
S32 lru_entries = (S32)((F32)sCacheMaxEntries * TEXTURE_CACHE_LRU_SIZE);
for (std::set<lru_data_t>::iterator iter = lru.begin(); iter != lru.end(); ++iter)
@@ -1578,30 +1578,19 @@ void LLTextureCache::readHeaderCache()
if (purge_list.size() > 0)
{
+ LLTimer timer;
for (std::set<U32>::iterator iter = purge_list.begin(); iter != purge_list.end(); ++iter)
{
std::string tex_filename = getTextureFileName(entries[*iter].mID);
removeEntry((S32)*iter, entries[*iter], tex_filename);
- }
- // If we removed any entries, we need to rebuild the entries list,
- // write the header, and call this again
- std::vector<Entry> new_entries;
- for (U32 i=0; i<num_entries; i++)
- {
- const Entry& entry = entries[i];
- if (entry.mImageSize > 0)
+
+ //make sure that pruning entries doesn't take too much time
+ if (timer.getElapsedTimeF32() > TEXTURE_PRUNING_MAX_TIME)
{
- new_entries.push_back(entry);
+ break;
}
}
- mFreeList.clear(); // recreating list, no longer valid.
- llassert_always(new_entries.size() <= sCacheMaxEntries);
- mHeaderEntriesInfo.mEntries = new_entries.size();
- writeEntriesHeader();
- writeEntriesAndClose(new_entries);
- mHeaderMutex.unlock(); // unlock the mutex before calling again
- readHeaderCache(); // repeat with new entries file
- mHeaderMutex.lock();
+ writeEntriesAndClose(entries);
}
else
{
@@ -1724,7 +1713,7 @@ void LLTextureCache::purgeTexturesLazy(F32 time_limit_sec)
}
S64 cache_size = mTexturesSizeTotal;
- S64 purged_cache_size = (sCacheMaxTexturesSize * (S64)((1.f - TEXTURE_CACHE_PURGE_AMOUNT) * 100)) / 100;
+ S64 purged_cache_size = (llmax(cache_size, sCacheMaxTexturesSize) * (S64)((1.f - TEXTURE_CACHE_PURGE_AMOUNT) * 100)) / 100;
for (time_idx_set_t::iterator iter = time_idx_set.begin();
iter != time_idx_set.end(); ++iter)
{
@@ -1820,21 +1809,26 @@ void LLTextureCache::purgeTextures(bool validate)
}
S64 cache_size = mTexturesSizeTotal;
- S64 purged_cache_size = (sCacheMaxTexturesSize * (S64)((1.f-TEXTURE_CACHE_PURGE_AMOUNT)*100)) / 100;
+ S64 purged_cache_size = (llmax(cache_size, sCacheMaxTexturesSize) * (S64)((1.f - TEXTURE_CACHE_PURGE_AMOUNT) * 100)) / 100;
S32 purge_count = 0;
for (time_idx_set_t::iterator iter = time_idx_set.begin();
iter != time_idx_set.end(); ++iter)
{
S32 idx = iter->second;
bool purge_entry = false;
- if (validate)
+
+ if (cache_size >= purged_cache_size)
+ {
+ purge_entry = true;
+ }
+ else if (validate)
{
// make sure file exists and is the correct size
U32 uuididx = entries[idx].mID.mData[0];
if (uuididx == validate_idx)
{
- std::string filename = getTextureFileName(entries[idx].mID);
- LL_DEBUGS("TextureCache") << "Validating: " << filename << "Size: " << entries[idx].mBodySize << LL_ENDL;
+ std::string filename = getTextureFileName(entries[idx].mID);
+ LL_DEBUGS("TextureCache") << "Validating: " << filename << "Size: " << entries[idx].mBodySize << LL_ENDL;
// mHeaderAPRFilePoolp because this is under header mutex in main thread
S32 bodysize = LLAPRFile::size(filename, mHeaderAPRFilePoolp);
if (bodysize != entries[idx].mBodySize)
@@ -1844,10 +1838,6 @@ void LLTextureCache::purgeTextures(bool validate)
}
}
}
- else if (cache_size >= purged_cache_size)
- {
- purge_entry = true;
- }
else
{
break;
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 64d9ce62c5..0f102411d5 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -28,8 +28,7 @@
#include "llviewerassetstorage.h"
-#include "llvfile.h"
-#include "llvfs.h"
+#include "llfilesystem.h"
#include "message.h"
#include "llagent.h"
@@ -104,10 +103,8 @@ public:
///----------------------------------------------------------------------------
// Unused?
-LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
- LLVFS *vfs, LLVFS *static_vfs,
- const LLHost &upstream_host)
- : LLAssetStorage(msg, xfer, vfs, static_vfs, upstream_host),
+LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, const LLHost &upstream_host)
+ : LLAssetStorage(msg, xfer, upstream_host),
mAssetCoroCount(0),
mCountRequests(0),
mCountStarted(0),
@@ -118,10 +115,8 @@ LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *
LLCoprocedureManager::instance().initializePool(VIEWER_ASSET_STORAGE_CORO_POOL);
}
-
-LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
- LLVFS *vfs, LLVFS *static_vfs)
- : LLAssetStorage(msg, xfer, vfs, static_vfs),
+LLViewerAssetStorage::LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer)
+ : LLAssetStorage(msg, xfer),
mAssetCoroCount(0),
mCountRequests(0),
mCountStarted(0),
@@ -167,13 +162,13 @@ void LLViewerAssetStorage::storeAssetData(
if (mUpstreamHost.isOk())
{
- if (mVFS->getExists(asset_id, asset_type))
+ if (LLFileSystem::getExists(asset_id, asset_type))
{
// Pack data into this packet if we can fit it.
U8 buffer[MTUBYTES];
buffer[0] = 0;
- LLVFile vfile(mVFS, asset_id, asset_type, LLVFile::READ);
+ LLFileSystem vfile(asset_id, asset_type, LLFileSystem::READ);
S32 asset_size = vfile.getSize();
LLAssetRequest *req = new LLAssetRequest(asset_id, asset_type);
@@ -182,22 +177,20 @@ void LLViewerAssetStorage::storeAssetData(
if (asset_size < 1)
{
- // This can happen if there's a bug in our code or if the VFS has been corrupted.
- LL_WARNS("AssetStorage") << "LLViewerAssetStorage::storeAssetData() Data _should_ already be in the VFS, but it's not! " << asset_id << LL_ENDL;
- // LLAssetStorage metric: Zero size VFS
- reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (VFS - can't tell which)" );
+ // This can happen if there's a bug in our code or if the cache has been corrupted.
+ LL_WARNS("AssetStorage") << "LLViewerAssetStorage::storeAssetData() Data _should_ already be in the cache, but it's not! " << asset_id << LL_ENDL;
delete req;
if (callback)
{
- callback(asset_id, user_data, LL_ERR_ASSET_REQUEST_FAILED, LLExtStat::VFS_CORRUPT);
+ callback(asset_id, user_data, LL_ERR_ASSET_REQUEST_FAILED, LLExtStat::CACHE_CORRUPT);
}
return;
}
else
{
// LLAssetStorage metric: Successful Request
- S32 size = mVFS->getSize(asset_id, asset_type);
+ S32 size = LLFileSystem::getFileSize(asset_id, asset_type);
const char *message = "Added to upload queue";
reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, size, MR_OKAY, __FILE__, __LINE__, message );
@@ -211,7 +204,7 @@ void LLViewerAssetStorage::storeAssetData(
}
}
- // Read the data from the VFS if it'll fit in this packet.
+ // Read the data from the cache if it'll fit in this packet.
if (asset_size + 100 < MTUBYTES)
{
BOOL res = vfile.read(buffer, asset_size); /* Flawfinder: ignore */
@@ -224,14 +217,11 @@ void LLViewerAssetStorage::storeAssetData(
}
else
{
- LL_WARNS("AssetStorage") << "Probable corruption in VFS file, aborting store asset data" << LL_ENDL;
-
- // LLAssetStorage metric: VFS corrupt - bogus size
- reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, asset_size, MR_VFS_CORRUPTION, __FILE__, __LINE__, "VFS corruption" );
+ LL_WARNS("AssetStorage") << "Probable corruption in cache file, aborting store asset data" << LL_ENDL;
if (callback)
{
- callback(asset_id, user_data, LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE, LLExtStat::VFS_CORRUPT);
+ callback(asset_id, user_data, LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE, LLExtStat::CACHE_CORRUPT);
}
return;
}
@@ -254,8 +244,7 @@ void LLViewerAssetStorage::storeAssetData(
else
{
LL_WARNS("AssetStorage") << "AssetStorage: attempt to upload non-existent vfile " << asset_id << ":" << LLAssetType::lookup(asset_type) << LL_ENDL;
- // LLAssetStorage metric: Zero size VFS
- reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (VFS - can't tell which)" );
+ reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (cache - can't tell which)" );
if (callback)
{
callback(asset_id, user_data, LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE, LLExtStat::NONEXISTENT_FILE);
@@ -288,7 +277,6 @@ void LLViewerAssetStorage::storeAssetData(
if(filename.empty())
{
// LLAssetStorage metric: no filename
- reportMetric( LLUUID::null, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_VFS_CORRUPTION, __FILE__, __LINE__, "Filename missing" );
LL_ERRS() << "No filename specified" << LL_ENDL;
return;
}
@@ -313,9 +301,7 @@ void LLViewerAssetStorage::storeAssetData(
legacy->mUpCallback = callback;
legacy->mUserData = user_data;
- LLVFile file(mVFS, asset_id, asset_type, LLVFile::WRITE);
-
- file.setMaxSize(size);
+ LLFileSystem file(asset_id, asset_type, LLFileSystem::APPEND);
const S32 buf_size = 65536;
U8 copy_buf[buf_size];
@@ -584,21 +570,20 @@ void LLViewerAssetStorage::assetRequestCoro(
// case.
LLUUID temp_id;
temp_id.generate();
- LLVFile vf(gAssetStorage->mVFS, temp_id, atype, LLVFile::WRITE);
- vf.setMaxSize(size);
+ LLFileSystem vf(temp_id, atype, LLFileSystem::WRITE);
req->mBytesFetched = size;
if (!vf.write(raw.data(),size))
{
// TODO asset-http: handle error
LL_WARNS("ViewerAsset") << "Failure in vf.write()" << LL_ENDL;
result_code = LL_ERR_ASSET_REQUEST_FAILED;
- ext_status = LLExtStat::VFS_CORRUPT;
+ ext_status = LLExtStat::CACHE_CORRUPT;
}
else if (!vf.rename(uuid, atype))
{
LL_WARNS("ViewerAsset") << "rename failed" << LL_ENDL;
result_code = LL_ERR_ASSET_REQUEST_FAILED;
- ext_status = LLExtStat::VFS_CORRUPT;
+ ext_status = LLExtStat::CACHE_CORRUPT;
}
else
{
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h
index c1a5534b81..af7fbb5fbf 100644
--- a/indra/newview/llviewerassetstorage.h
+++ b/indra/newview/llviewerassetstorage.h
@@ -30,18 +30,16 @@
#include "llassetstorage.h"
#include "llcorehttputil.h"
-class LLVFile;
+class LLFileSystem;
class LLViewerAssetRequest;
class LLViewerAssetStorage : public LLAssetStorage
{
public:
- LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
- LLVFS *vfs, LLVFS *static_vfs, const LLHost &upstream_host);
+ LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer, const LLHost &upstream_host);
- LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
- LLVFS *vfs, LLVFS *static_vfs);
+ LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer);
~LLViewerAssetStorage();
diff --git a/indra/newview/llviewerassetupload.cpp b/indra/newview/llviewerassetupload.cpp
index 0df6811f6a..3f7e8531fb 100644
--- a/indra/newview/llviewerassetupload.cpp
+++ b/indra/newview/llviewerassetupload.cpp
@@ -45,7 +45,7 @@
#include "llviewerassetupload.h"
#include "llappviewer.h"
#include "llviewerstats.h"
-#include "llvfile.h"
+#include "llfilesystem.h"
#include "llgesturemgr.h"
#include "llpreviewnotecard.h"
#include "llpreviewgesture.h"
@@ -467,15 +467,13 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile()
setAssetType(assetType);
- // copy this file into the vfs for upload
+ // copy this file into the cache for upload
S32 file_size;
LLAPRFile infile;
infile.open(filename, LL_APR_RB, NULL, &file_size);
if (infile.getFileHandle())
{
- LLVFile file(gVFS, getAssetId(), assetType, LLVFile::WRITE);
-
- file.setMaxSize(file_size);
+ LLFileSystem file(getAssetId(), assetType, LLFileSystem::APPEND);
const S32 buf_size = 65536;
U8 copy_buf[buf_size];
@@ -507,7 +505,7 @@ LLBufferedAssetUploadInfo::LLBufferedAssetUploadInfo(LLUUID itemId, LLAssetType:
mContents(buffer),
mInvnFinishFn(finish),
mTaskFinishFn(nullptr),
- mStoredToVFS(false)
+ mStoredToCache(false)
{
setItemId(itemId);
setAssetType(assetType);
@@ -521,7 +519,7 @@ LLBufferedAssetUploadInfo::LLBufferedAssetUploadInfo(LLUUID itemId, LLPointer<LL
mContents(),
mInvnFinishFn(finish),
mTaskFinishFn(nullptr),
- mStoredToVFS(false)
+ mStoredToCache(false)
{
setItemId(itemId);
@@ -555,7 +553,7 @@ LLBufferedAssetUploadInfo::LLBufferedAssetUploadInfo(LLUUID taskId, LLUUID itemI
mContents(buffer),
mInvnFinishFn(nullptr),
mTaskFinishFn(finish),
- mStoredToVFS(false)
+ mStoredToCache(false)
{
setItemId(itemId);
setAssetType(assetType);
@@ -566,13 +564,12 @@ LLSD LLBufferedAssetUploadInfo::prepareUpload()
if (getAssetId().isNull())
generateNewAssetId();
- LLVFile file(gVFS, getAssetId(), getAssetType(), LLVFile::APPEND);
+ LLFileSystem file(getAssetId(), getAssetType(), LLFileSystem::APPEND);
S32 size = mContents.length() + 1;
- file.setMaxSize(size);
file.write((U8*)mContents.c_str(), size);
- mStoredToVFS = true;
+ mStoredToCache = true;
return LLSD().with("success", LLSD::Boolean(true));
}
@@ -595,10 +592,10 @@ LLUUID LLBufferedAssetUploadInfo::finishUpload(LLSD &result)
LLUUID newAssetId = result["new_asset"].asUUID();
LLUUID itemId = getItemId();
- if (mStoredToVFS)
+ if (mStoredToCache)
{
LLAssetType::EType assetType(getAssetType());
- gVFS->renameFile(getAssetId(), assetType, newAssetId, assetType);
+ LLFileSystem::renameFile(getAssetId(), assetType, newAssetId, assetType);
}
if (mTaskUpload)
diff --git a/indra/newview/llviewerassetupload.h b/indra/newview/llviewerassetupload.h
index d9eacf3167..e56ba7d8f7 100644
--- a/indra/newview/llviewerassetupload.h
+++ b/indra/newview/llviewerassetupload.h
@@ -197,7 +197,7 @@ private:
std::string mContents;
invnUploadFinish_f mInvnFinishFn;
taskUploadFinish_f mTaskFinishFn;
- bool mStoredToVFS;
+ bool mStoredToCache;
};
//-------------------------------------------------------------------------
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 89c600fc2c..bc425123e1 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -162,6 +162,17 @@ static bool handleSetShaderChanged(const LLSD& newvalue)
return true;
}
+static bool handleAvatarVPChanged(const LLSD& newvalue)
+{
+ LLRenderTarget::sUseFBO = newvalue.asBoolean()
+ && gSavedSettings.getBOOL("RenderObjectBump")
+ && gSavedSettings.getBOOL("RenderTransparentWater")
+ && gSavedSettings.getBOOL("RenderDeferred");
+
+ handleSetShaderChanged(LLSD());
+ return true;
+}
+
static bool handleRenderPerfTestChanged(const LLSD& newvalue)
{
bool status = !newvalue.asBoolean();
@@ -201,7 +212,10 @@ static bool handleRenderPerfTestChanged(const LLSD& newvalue)
bool handleRenderTransparentWaterChanged(const LLSD& newvalue)
{
- LLRenderTarget::sUseFBO = newvalue.asBoolean();
+ LLRenderTarget::sUseFBO = newvalue.asBoolean()
+ && gSavedSettings.getBOOL("RenderObjectBump")
+ && gSavedSettings.getBOOL("RenderAvatarVP")
+ && gSavedSettings.getBOOL("RenderDeferred");
if (gPipeline.isInit())
{
gPipeline.updateRenderTransparentWater();
@@ -454,7 +468,10 @@ static bool handleRenderDeferredChanged(const LLSD& newvalue)
//
static bool handleRenderBumpChanged(const LLSD& newval)
{
- LLRenderTarget::sUseFBO = newval.asBoolean();
+ LLRenderTarget::sUseFBO = newval.asBoolean()
+ && gSavedSettings.getBOOL("RenderTransparentWater")
+ && gSavedSettings.getBOOL("RenderAvatarVP")
+ && gSavedSettings.getBOOL("RenderDeferred");
if (gPipeline.isInit())
{
gPipeline.updateRenderBump();
@@ -648,7 +665,7 @@ void settings_setup_listeners()
gSavedSettings.getControl("OctreeAttachmentSizeFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2));
gSavedSettings.getControl("RenderMaxTextureIndex")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
gSavedSettings.getControl("RenderUseTriStrips")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
- gSavedSettings.getControl("RenderAvatarVP")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
+ gSavedSettings.getControl("RenderAvatarVP")->getSignal()->connect(boost::bind(&handleAvatarVPChanged, _2));
gSavedSettings.getControl("RenderUIBuffer")->getSignal()->connect(boost::bind(&handleWindowResized, _2));
gSavedSettings.getControl("RenderDepthOfField")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _2));
gSavedSettings.getControl("RenderFSAASamples")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _2));
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index 5a05f89758..62d73063aa 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -33,6 +33,7 @@
#include "llcommandhandler.h"
#include "llcompilequeue.h"
#include "llfasttimerview.h"
+#include "llfloater360capture.h"
#include "llfloaterabout.h"
#include "llfloateraddpaymentmethod.h"
#include "llfloaterauction.h"
@@ -195,6 +196,7 @@ void LLViewerFloaterReg::registerFloaters()
// *NOTE: Please keep these alphabetized for easier merges
LLFloaterAboutUtil::registerFloater();
+ LLFloaterReg::add("360capture", "floater_360capture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater360Capture>);
LLFloaterReg::add("block_timers", "floater_fast_timers.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFastTimerView>);
LLFloaterReg::add("about_land", "floater_about_land.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterLand>);
LLFloaterReg::add("add_payment_method", "floater_add_payment_method.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAddPaymentMethod>);
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index d0cf8ea407..54c2099ac9 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1752,8 +1752,16 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
media_source->cookies_enabled( cookies_enabled || clean_browser);
// collect 'javascript enabled' setting from prefs and send to embedded browser
- bool javascript_enabled = gSavedSettings.getBOOL( "BrowserJavascriptEnabled" );
- media_source->setJavascriptEnabled( javascript_enabled || clean_browser);
+ bool javascript_enabled = gSavedSettings.getBOOL("BrowserJavascriptEnabled");
+ media_source->setJavascriptEnabled(javascript_enabled || clean_browser);
+
+ // collect 'web security disabled' (see Chrome --web-security-disabled) setting from prefs and send to embedded browser
+ bool web_security_disabled = gSavedSettings.getBOOL("BrowserWebSecurityDisabled");
+ media_source->setWebSecurityDisabled(web_security_disabled || clean_browser);
+
+ // collect setting indicates if local file access from file URLs is allowed from prefs and send to embedded browser
+ bool file_access_from_file_urls = gSavedSettings.getBOOL("BrowserFileAccessFromFileUrls");
+ media_source->setFileAccessFromFileUrlsEnabled(file_access_from_file_urls || clean_browser);
// As of SL-15559 PDF files do not load in CEF v91 we enable plugins
// but explicitly disable Flash (PDF support in CEF is now treated as a plugin)
@@ -1915,6 +1923,15 @@ void LLViewerMediaImpl::loadURI()
}
//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::executeJavaScript(const std::string& code)
+{
+ if (mMediaSource)
+ {
+ mMediaSource->executeJavaScript(code);
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
void LLViewerMediaImpl::setSize(int width, int height)
{
mMediaWidth = width;
@@ -3219,8 +3236,19 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla
case LLViewerMediaObserver::MEDIA_EVENT_FILE_DOWNLOAD:
{
- //llinfos << "Media event - file download requested - filename is " << self->getFileDownloadFilename() << llendl;
- LLNotificationsUtil::add("MediaFileDownloadUnsupported");
+ LL_DEBUGS("Media") << "Media event - file download requested - filename is " << plugin->getFileDownloadFilename() << LL_ENDL;
+ // pick a file from SAVE FILE dialog
+
+ // need a better algorithm that this or else, pass in type of save type
+ // from event that initiated it - this is okay for now - only thing
+ // that saves is 360s
+ std::string suggested_filename = plugin->getFileDownloadFilename();
+ LLFilePicker::ESaveFilter filter = LLFilePicker::FFSAVE_ALL;
+ if (suggested_filename.find(".jpg") != std::string::npos || suggested_filename.find(".jpeg") != std::string::npos)
+ filter = LLFilePicker::FFSAVE_JPEG;
+ if (suggested_filename.find(".png") != std::string::npos)
+ filter = LLFilePicker::FFSAVE_PNG;
+ init_threaded_picker_save_dialog(plugin, filter, suggested_filename);
}
break;
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 8bf1ad2441..71cec5125d 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -207,6 +207,7 @@ public:
bool initializeMedia(const std::string& mime_type);
bool initializePlugin(const std::string& media_type);
void loadURI();
+ void executeJavaScript(const std::string& code);
LLPluginClassMedia* getMediaPlugin() { return mMediaSource.get(); }
void setSize(int width, int height);
diff --git a/indra/newview/llviewermedia_streamingaudio.cpp b/indra/newview/llviewermedia_streamingaudio.cpp
index 3ccf3070ab..d3e24aece5 100644
--- a/indra/newview/llviewermedia_streamingaudio.cpp
+++ b/indra/newview/llviewermedia_streamingaudio.cpp
@@ -33,10 +33,8 @@
#include "llviewermedia_streamingaudio.h"
#include "llmimetypes.h"
-#include "llvfs.h"
#include "lldir.h"
-
LLStreamingAudio_MediaPlugins::LLStreamingAudio_MediaPlugins() :
mMediaPlugin(NULL),
mGain(1.0)
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 41e998e605..8d4a5fe7a0 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1286,12 +1286,55 @@ class LLAdvancedDumpScriptedCamera : public view_listener_t
class LLAdvancedDumpRegionObjectCache : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
-{
+ {
handle_dump_region_object_cache(NULL);
return true;
}
};
+class LLAdvancedInterestListFullUpdate : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLSD request;
+ LLSD body;
+ static bool using_360 = false;
+
+ if (using_360)
+ {
+ body["mode"] = LLSD::String("default");
+ }
+ else
+ {
+ body["mode"] = LLSD::String("360");
+ }
+ using_360 = !using_360;
+
+ if (gAgent.requestPostCapability("InterestList", body, [](const LLSD& response)
+ {
+ LL_INFOS("360Capture") <<
+ "InterestList capability responded: \n" <<
+ ll_pretty_print_sd(response) <<
+ LL_ENDL;
+ }))
+ {
+ LL_INFOS("360Capture") <<
+ "Successfully posted an InterestList capability request with payload: \n" <<
+ ll_pretty_print_sd(body) <<
+ LL_ENDL;
+ return true;
+ }
+ else
+ {
+ LL_INFOS("360Capture") <<
+ "Unable to post an InterestList capability request with payload: \n" <<
+ ll_pretty_print_sd(body) <<
+ LL_ENDL;
+ return false;
+ }
+ }
+};
+
class LLAdvancedBuyCurrencyTest : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@@ -2347,11 +2390,10 @@ class LLAdvancedLeaveAdminStatus : public view_listener_t
// Advanced > Debugging //
//////////////////////////
-
class LLAdvancedForceErrorBreakpoint : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
- {
+ {
force_error_breakpoint(NULL);
return true;
}
@@ -9265,6 +9307,7 @@ void initialize_menus()
// Advanced > World
view_listener_t::addMenu(new LLAdvancedDumpScriptedCamera(), "Advanced.DumpScriptedCamera");
view_listener_t::addMenu(new LLAdvancedDumpRegionObjectCache(), "Advanced.DumpRegionObjectCache");
+ view_listener_t::addMenu(new LLAdvancedInterestListFullUpdate(), "Advanced.InterestListFullUpdate");
// Advanced > UI
commit.add("Advanced.WebBrowserTest", boost::bind(&handle_web_browser_test, _2)); // sigh! this one opens the MEDIA browser
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 43f99fc13a..f5b41d3179 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -53,8 +53,6 @@
#include "llviewercontrol.h" // gSavedSettings
#include "llviewertexturelist.h"
#include "lluictrlfactory.h"
-#include "llvfile.h"
-#include "llvfs.h"
#include "llviewerinventory.h"
#include "llviewermenu.h" // gMenuHolder
#include "llviewerparcelmgr.h"
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 511673d6a0..68cb67fb12 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -45,8 +45,7 @@
#include "llteleportflags.h"
#include "lltoastnotifypanel.h"
#include "lltransactionflags.h"
-#include "llvfile.h"
-#include "llvfs.h"
+#include "llfilesystem.h"
#include "llxfermanager.h"
#include "mean_collision_data.h"
@@ -3753,6 +3752,7 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
{
LLColor4 color(0.f,1.f,0.f,1.f);
gPipeline.addDebugBlip(objectp->getPositionAgent(), color);
+ LL_DEBUGS("MessageBlip") << "Kill blip for local " << local_id << " at " << objectp->getPositionAgent() << LL_ENDL;
}
// Do the kill
@@ -6437,15 +6437,12 @@ void process_user_info_reply(LLMessageSystem* msg, void**)
<< "wrong agent id." << LL_ENDL;
}
- BOOL im_via_email;
- msg->getBOOLFast(_PREHASH_UserData, _PREHASH_IMViaEMail, im_via_email);
std::string email;
msg->getStringFast(_PREHASH_UserData, _PREHASH_EMail, email);
std::string dir_visibility;
msg->getString( "UserData", "DirectoryVisibility", dir_visibility);
- // For Message based user info information the is_verified is assumed to be false.
- LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email, false);
+ LLFloaterPreference::updateUserInfo(dir_visibility);
LLFloaterSnapshot::setAgentEmail(email);
}
@@ -6864,16 +6861,15 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
}
}
-void onCovenantLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
- LLAssetType::EType type,
- void* user_data, S32 status, LLExtStat ext_status)
+void onCovenantLoadComplete(const LLUUID& asset_uuid,
+ LLAssetType::EType type,
+ void* user_data, S32 status, LLExtStat ext_status)
{
LL_DEBUGS("Messaging") << "onCovenantLoadComplete()" << LL_ENDL;
std::string covenant_text;
if(0 == status)
{
- LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
+ LLFileSystem file(asset_uuid, type, LLFileSystem::READ);
S32 file_length = file.getSize();
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h
index 78829a6a56..1e5a69ae13 100644
--- a/indra/newview/llviewermessage.h
+++ b/indra/newview/llviewermessage.h
@@ -47,7 +47,6 @@ class LLInventoryObject;
class LLInventoryItem;
class LLMeanCollisionData;
class LLMessageSystem;
-class LLVFS;
class LLViewerObject;
class LLViewerRegion;
@@ -189,8 +188,7 @@ void process_script_dialog(LLMessageSystem* msg, void**);
void process_load_url(LLMessageSystem* msg, void**);
void process_script_teleport_request(LLMessageSystem* msg, void**);
void process_covenant_reply(LLMessageSystem* msg, void**);
-void onCovenantLoadComplete(LLVFS *vfs,
- const LLUUID& asset_uuid,
+void onCovenantLoadComplete(const LLUUID& asset_uuid,
LLAssetType::EType type,
void* user_data, S32 status, LLExtStat ext_status);
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index b88baf6aa7..31e80eb865 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2402,6 +2402,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
color.setVec(1.f, 0.f, 0.f, 1.f);
}
gPipeline.addDebugBlip(getPositionAgent(), color);
+ LL_DEBUGS("MessageBlip") << "Update type " << (S32)update_type << " blip for local " << mLocalID << " at " << getPositionAgent() << LL_ENDL;
}
const F32 MAG_CUTOFF = F_APPROXIMATELY_ZERO;
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index bbbacce8fa..e378c2448a 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -101,7 +101,6 @@
#include "v4math.h"
#include "xform.h"
-// Library includes from llvfs
#include "lldir.h"
// Library includes from llmessage project
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 198fe1563c..0f409701d1 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -2968,6 +2968,8 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
capabilityNames.append("IncrementCOFVersion");
AISAPI::getCapNames(capabilityNames);
+ capabilityNames.append("InterestList");
+
capabilityNames.append("GetDisplayNames");
capabilityNames.append("GetExperiences");
capabilityNames.append("AgentExperiences");
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index c29fdeb943..6c5b5d3c9e 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -33,7 +33,6 @@
#include "llfloaterreg.h"
#include "llmemory.h"
#include "lltimer.h"
-#include "llvfile.h"
#include "llappviewer.h"
@@ -146,7 +145,6 @@ LLTrace::SampleStatHandle<> FPS_SAMPLE("fpssample"),
VISIBLE_AVATARS("visibleavatars", "Visible Avatars"),
SHADER_OBJECTS("shaderobjects", "Object Shaders"),
DRAW_DISTANCE("drawdistance", "Draw Distance"),
- PENDING_VFS_OPERATIONS("vfspendingoperations"),
WINDOW_WIDTH("windowwidth", "Window width"),
WINDOW_HEIGHT("windowheight", "Window height");
@@ -384,7 +382,6 @@ void update_statistics()
F64Bits layer_bits = gVLManager.getLandBits() + gVLManager.getWindBits() + gVLManager.getCloudBits();
add(LLStatViewer::LAYERS_NETWORK_DATA_RECEIVED, layer_bits);
add(LLStatViewer::OBJECT_NETWORK_DATA_RECEIVED, gObjectData);
- sample(LLStatViewer::PENDING_VFS_OPERATIONS, LLVFile::getVFSThread()->getPending());
add(LLStatViewer::ASSET_UDP_DATA_RECEIVED, F64Bits(gTransferManager.getTransferBitsIn(LLTCT_ASSET)));
gTransferManager.resetTransferBitsIn(LLTCT_ASSET);
diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h
index 04870e0c26..72ce336664 100644
--- a/indra/newview/llviewerstats.h
+++ b/indra/newview/llviewerstats.h
@@ -186,7 +186,6 @@ extern LLTrace::SampleStatHandle<> FPS_SAMPLE,
VISIBLE_AVATARS,
SHADER_OBJECTS,
DRAW_DISTANCE,
- PENDING_VFS_OPERATIONS,
WINDOW_WIDTH,
WINDOW_HEIGHT;
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp
index c501dd0035..4c2fbcf837 100644
--- a/indra/newview/llviewertexlayer.cpp
+++ b/indra/newview/llviewertexlayer.cpp
@@ -31,8 +31,6 @@
#include "llagent.h"
#include "llimagej2c.h"
#include "llnotificationsutil.h"
-#include "llvfile.h"
-#include "llvfs.h"
#include "llviewerregion.h"
#include "llglslshader.h"
#include "llvoavatarself.h"
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 7fbc4d789b..075588d577 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -39,8 +39,6 @@
#include "llimagej2c.h"
#include "llimagetga.h"
#include "llstl.h"
-#include "llvfile.h"
-#include "llvfs.h"
#include "message.h"
#include "lltimer.h"
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index 69568cc825..07997e02a5 100644
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -54,7 +54,7 @@ class LLTexturePipelineTester ;
typedef void (*loaded_callback_func)( BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata );
-class LLVFile;
+class LLFileSystem;
class LLMessageSystem;
class LLViewerMediaImpl ;
class LLVOVolume ;
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 561319ca5d..38fccba169 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -41,9 +41,7 @@
#include "llsdserialize.h"
#include "llsys.h"
-#include "llvfs.h"
-#include "llvfile.h"
-#include "llvfsthread.h"
+#include "llfilesystem.h"
#include "llxmltree.h"
#include "message.h"
diff --git a/indra/newview/llviewerwearable.cpp b/indra/newview/llviewerwearable.cpp
index c80cf27bda..bc21b5bf84 100644
--- a/indra/newview/llviewerwearable.cpp
+++ b/indra/newview/llviewerwearable.cpp
@@ -107,7 +107,6 @@ LLWearable::EImportResult LLViewerWearable::importStream( std::istream& input_st
// Shouldn't really log the asset id for security reasons, but
// we need it in this case.
LL_WARNS() << "Bad Wearable asset header: " << mAssetID << LL_ENDL;
- //gVFS->dumpMap();
return result;
}
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 73f493e89a..ca20832a39 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -5176,6 +5176,104 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
return ret;
}
+BOOL LLViewerWindow::simpleSnapshot(LLImageRaw* raw, S32 image_width, S32 image_height, const int num_render_passes)
+{
+ gDisplaySwapBuffers = FALSE;
+
+ glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
+ setCursor(UI_CURSOR_WAIT);
+
+ BOOL prev_draw_ui = gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI) ? TRUE : FALSE;
+ if (prev_draw_ui != false)
+ {
+ LLPipeline::toggleRenderDebugFeature(LLPipeline::RENDER_DEBUG_FEATURE_UI);
+ }
+
+ LLPipeline::sShowHUDAttachments = FALSE;
+ LLRect window_rect = getWorldViewRectRaw();
+
+ S32 original_width = LLPipeline::sRenderDeferred ? gPipeline.mDeferredScreen.getWidth() : gViewerWindow->getWorldViewWidthRaw();
+ S32 original_height = LLPipeline::sRenderDeferred ? gPipeline.mDeferredScreen.getHeight() : gViewerWindow->getWorldViewHeightRaw();
+
+ LLRenderTarget scratch_space;
+ U32 color_fmt = GL_RGBA;
+ const bool use_depth_buffer = true;
+ const bool use_stencil_buffer = true;
+ if (scratch_space.allocate(image_width, image_height, color_fmt, use_depth_buffer, use_stencil_buffer))
+ {
+ if (gPipeline.allocateScreenBuffer(image_width, image_height))
+ {
+ mWorldViewRectRaw.set(0, image_height, image_width, 0);
+
+ scratch_space.bindTarget();
+ }
+ else
+ {
+ scratch_space.release();
+ gPipeline.allocateScreenBuffer(original_width, original_height);
+ }
+ }
+
+ // we render the scene more than once since this helps
+ // greatly with the objects not being drawn in the
+ // snapshot when they are drawn in the scene. This is
+ // evident when you set this value via the debug setting
+ // called 360CaptureNumRenderPasses to 1. The theory is
+ // that the missing objects are caused by the sUseOcclusion
+ // property in pipeline but that the use in pipeline.cpp
+ // lags by a frame or two so rendering more than once
+ // appears to help a lot.
+ for (int i = 0; i < num_render_passes; ++i)
+ {
+ // turning this flag off here prohibits the screen swap
+ // to present the new page to the viewer - this stops
+ // the black flash in between captures when the number
+ // of render passes is more than 1. We need to also
+ // set it here because code in LLViewerDisplay resets
+ // it to TRUE each time.
+ gDisplaySwapBuffers = FALSE;
+
+ // actually render the scene
+ const U32 subfield = 0;
+ const bool do_rebuild = true;
+ const F32 zoom = 1.0;
+ const bool for_snapshot = TRUE;
+ display(do_rebuild, zoom, subfield, for_snapshot);
+ }
+
+ glReadPixels(
+ 0, 0,
+ image_width,
+ image_height,
+ GL_RGB, GL_UNSIGNED_BYTE,
+ raw->getData()
+ );
+ stop_glerror();
+
+ gDisplaySwapBuffers = FALSE;
+ gDepthDirty = TRUE;
+
+ if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_UI))
+ {
+ if (prev_draw_ui != false)
+ {
+ LLPipeline::toggleRenderDebugFeature(LLPipeline::RENDER_DEBUG_FEATURE_UI);
+ }
+ }
+
+ LLPipeline::sShowHUDAttachments = TRUE;
+
+ setCursor(UI_CURSOR_ARROW);
+
+ gPipeline.resetDrawOrders();
+ mWorldViewRectRaw = window_rect;
+ scratch_space.flush();
+ scratch_space.release();
+ gPipeline.allocateScreenBuffer(original_width, original_height);
+
+ return true;
+}
+
void LLViewerWindow::destroyWindow()
{
if (mWindow)
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index 8a6df613dc..713cc51bf7 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -357,7 +357,10 @@ public:
BOOL saveSnapshot(const std::string& filename, S32 image_width, S32 image_height, BOOL show_ui = TRUE, BOOL show_hud = TRUE, BOOL do_rebuild = FALSE, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, LLSnapshotModel::ESnapshotFormat format = LLSnapshotModel::SNAPSHOT_FORMAT_BMP);
BOOL rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, BOOL keep_window_aspect = TRUE, BOOL is_texture = FALSE,
BOOL show_ui = TRUE, BOOL show_hud = TRUE, BOOL do_rebuild = FALSE, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, S32 max_size = MAX_SNAPSHOT_IMAGE_SIZE);
- BOOL thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 preview_height, BOOL show_ui, BOOL show_hud, BOOL do_rebuild, LLSnapshotModel::ESnapshotLayerType type);
+
+ BOOL simpleSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, const int num_render_passes);
+
+ BOOL thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 preview_height, BOOL show_ui, BOOL show_hud, BOOL do_rebuild, LLSnapshotModel::ESnapshotLayerType type);
BOOL isSnapshotLocSet() const;
void resetSnapshotLoc() const;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 0e0ebce949..5d994058c2 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1140,7 +1140,6 @@ void LLVOAvatar::initInstance()
//-------------------------------------------------------------------------
if (LLCharacter::sInstances.size() == 1)
{
- LLKeyframeMotion::setVFS(gStaticVFS);
registerMotion( ANIM_AGENT_DO_NOT_DISTURB, LLNullMotion::create );
registerMotion( ANIM_AGENT_CROUCH, LLKeyframeStandMotion::create );
registerMotion( ANIM_AGENT_CROUCHWALK, LLKeyframeWalkMotion::create );
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index ce400a3498..73eeec813c 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -218,10 +218,9 @@ public:
void updateSculptTexture();
void setIndexInTex(U32 ch, S32 index) { mIndexInTex[ch] = index ;}
void sculpt();
- static void rebuildMeshAssetCallback(LLVFS *vfs,
- const LLUUID& asset_uuid,
- LLAssetType::EType type,
- void* user_data, S32 status, LLExtStat ext_status);
+ static void rebuildMeshAssetCallback(const LLUUID& asset_uuid,
+ LLAssetType::EType type,
+ void* user_data, S32 status, LLExtStat ext_status);
void updateRelativeXform(bool force_identity = false);
/*virtual*/ BOOL updateGeometry(LLDrawable *drawable);
diff --git a/indra/newview/skins/default/html/common/equirectangular/default.html b/indra/newview/skins/default/html/common/equirectangular/default.html
new file mode 100644
index 0000000000..227b306590
--- /dev/null
+++ b/indra/newview/skins/default/html/common/equirectangular/default.html
@@ -0,0 +1,22 @@
+<html>
+<head>
+<style>
+body {
+ background-color:#000;
+ background-image: linear-gradient(white 2px, transparent 2px),
+ linear-gradient(90deg, white 2px, transparent 2px),
+ linear-gradient(rgba(255,255,255,.3) 1px, transparent 1px),
+ linear-gradient(90deg, rgba(255,255,255,.3) 1px, transparent 1px);
+ background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;
+ background-position:-2px -2px, -2px -2px, -1px -1px, -1px -1px;
+}
+</style>
+</head>
+<body>
+<script>
+function start() {
+}
+document.addEventListener('DOMContentLoaded', start);
+</script>
+</body>
+</html> \ No newline at end of file
diff --git a/indra/newview/skins/default/html/common/equirectangular/eqr_gen.html b/indra/newview/skins/default/html/common/equirectangular/eqr_gen.html
new file mode 100644
index 0000000000..2675d37727
--- /dev/null
+++ b/indra/newview/skins/default/html/common/equirectangular/eqr_gen.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+ <style>
+ body {
+ background: #333;
+ padding: 0;
+ margin: 0;
+ overflow: hidden;
+ }
+ #error_message {
+ z-index: 2;
+ background-color: #aa3333;
+ overflow: hidden;
+ display: none;
+ pointer-events:none;
+ font-family: monospace;
+ font-size: 3em;
+ color: white;
+ border-radius: 1em;
+ padding: 1em;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ margin-right: -50%;
+ transform: translate(-50%, -50%)
+ }
+ #quality_window {
+ user-select: none;
+ z-index: 100;
+ position: absolute;
+ left: 8px;
+ top: 8px;
+ width: auto;
+ border-radius: 16px;
+ height: auto;
+ font-size: 1.5em;
+ text-align: center;
+ font-family: monospace;
+ background-color: rgba(200,200,200,0.35);
+ color: #000;
+ padding-left: 16px;
+ padding-right: 16px;
+ padding-top: 8px;
+ padding-bottom: 8px;
+ }
+ </style>
+</head>
+<body>
+ <script src="js/three.min.js"></script>
+ <script src="js/OrbitControls.js"></script>
+ <script src="js/jpeg_encoder_basic.js" type="text/javascript"></script>
+ <script src="js/CubemapToEquirectangular.js"></script>
+ <script>
+ var controls, camera, scene, renderer, equiManaged;
+
+ function init(eqr_width, eqr_height, img_path, camera_fov, initial_heading, overlay_label) {
+
+ camera = new THREE.PerspectiveCamera(camera_fov, window.innerWidth / window.innerHeight, 0.1, 100);
+ camera.position.x = 0.01;
+
+ scene = new THREE.Scene();
+
+ renderer = new THREE.WebGLRenderer();
+ renderer.autoClear = false;
+ renderer.setPixelRatio(window.devicePixelRatio);
+ renderer.setSize(window.innerWidth, window.innerHeight);
+
+ var cubemap_img_js_url = img_path + '/cubemap_img.js';
+ var cubemap_image_js = document.createElement('script');
+ cubemap_image_js.setAttribute('type', 'text/javascript');
+ cubemap_image_js.setAttribute('src', cubemap_img_js_url);
+ document.getElementsByTagName('head')[0].appendChild(cubemap_image_js);
+ cubemap_image_js.onload = function () {
+ document.getElementById("error_message").style.display = 'none'
+ scene.background = new THREE.CubeTextureLoader().load(cubemap_img_js);
+ equiManaged = new CubemapToEquirectangular(renderer, true, eqr_width, eqr_height);
+ };
+ cubemap_image_js.onerror = function () {
+ document.getElementById("error_message").style.display = 'inline-block'
+ };
+
+ document.body.appendChild(renderer.domElement);
+ window.addEventListener('resize', onWindowResize, false);
+
+ controls = new THREE.OrbitControls(camera, renderer.domElement);
+ controls.autoRotate = true;
+ controls.autoRotateSpeed = 0.2;
+ controls.enableZoom = false;
+ controls.enablePan = false;
+ controls.enableDamping = true;
+ controls.dampingFactor = 0.15;
+ controls.rotateSpeed = -0.5;
+
+ // initial direction the camera faces
+ // We cannot edit camera rotation directly as the OrbitControls will
+ // immediately reset it so we need some math to tell the controls
+ // there to look at initially. Note there is also an offset of π/2 since
+ // the Viewer and three.js have slightly different coordinate systems
+ var spherical_target = new THREE.Spherical(1, Math.PI / 2, initial_heading + Math.PI / 2)
+ var target = new THREE.Vector3().setFromSpherical(spherical_target)
+ camera.position.set(target.x, target.y, target.z);
+ controls.update();
+ controls.saveState();
+
+ // update the text that gets passed in from the C++ app for
+ // the translucent overlay label that tells us what we are seeing
+ document.getElementById('quality_window').innerHTML = overlay_label;
+
+ animate();
+ }
+
+ window.addEventListener(
+ 'mousedown',
+ function (event) {
+ controls.autoRotate = false;
+ },
+ false
+ );
+
+ window.addEventListener(
+ 'dblclick',
+ function (event) {
+ controls.autoRotate = true;
+ },
+ false
+ );
+
+ function saveAsEqrImage(filename, xmp_details) {
+ equiManaged.update(camera, scene, filename, xmp_details);
+ }
+
+ function onWindowResize() {
+ camera.aspect = window.innerWidth / window.innerHeight;
+ camera.updateProjectionMatrix();
+ renderer.setSize(window.innerWidth, window.innerHeight);
+ }
+
+ function animate() {
+ requestAnimationFrame(animate);
+ controls.update();
+ renderer.render(scene, camera);
+ }
+ </script>
+ <div id="error_message">UNABLE TO LOAD EQR IMAGE</div>
+ <div id="quality_window">Preview Quality</div>
+</body>
+</html> \ No newline at end of file
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 6104e99a4b..03e23b5ba3 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -131,7 +131,8 @@ with the same filename but different name
<texture name="Check_Mark" file_name="icons/check_mark.png" preload="true" />
<texture name="Checker" file_name="checker.png" preload="false" />
-
+
+ <texture name="Command_360_Capture_Icon" file_name="toolbar_icons/360_capture.png" preload="true" />
<texture name="Command_AboutLand_Icon" file_name="toolbar_icons/land.png" preload="true" />
<texture name="Command_Appearance_Icon" file_name="toolbar_icons/appearance.png" preload="true" />
<texture name="Command_Avatar_Icon" file_name="toolbar_icons/avatars.png" preload="true" />
diff --git a/indra/newview/skins/default/textures/toolbar_icons/360_capture.png b/indra/newview/skins/default/textures/toolbar_icons/360_capture.png
new file mode 100644
index 0000000000..163cebe29f
--- /dev/null
+++ b/indra/newview/skins/default/textures/toolbar_icons/360_capture.png
Binary files differ
diff --git a/indra/newview/skins/default/xui/da/floater_stats.xml b/indra/newview/skins/default/xui/da/floater_stats.xml
index fe3fa9626e..d07f9e48ca 100644
--- a/indra/newview/skins/default/xui/da/floater_stats.xml
+++ b/indra/newview/skins/default/xui/da/floater_stats.xml
@@ -32,7 +32,6 @@
<stat_bar label="Layers" name="layerskbitstat"/>
<stat_bar label="Actual In" name="actualinkbitstat"/>
<stat_bar label="Actual Out" name="actualoutkbitstat"/>
- <stat_bar label="VFS Pending Ops" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulator" name="sim">
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 3eed8146ae..5f1bf73f26 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -22,9 +22,6 @@
<string name="StartupInitializingTextureCache">
Initialiserer tekstur cache...
</string>
- <string name="StartupInitializingVFS">
- Initialiserer VFS...
- </string>
<string name="ProgressRestoring">
Gendanner...
</string>
diff --git a/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml
index dff462a594..a3749f1cfa 100644
--- a/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/de/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
<stat_bar label="Ebenen" name="layersdatareceived"/>
<stat_bar label="Tatsächlicher Eingang" name="messagedatain"/>
<stat_bar label="Tatsächlicher Ausgang" name="messagedataout"/>
- <stat_bar label="Ausstehende Vorgänge im VFS" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulator" name="sim">
diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml
index 4e6f56cd94..1838c2081a 100644
--- a/indra/newview/skins/default/xui/de/floater_stats.xml
+++ b/indra/newview/skins/default/xui/de/floater_stats.xml
@@ -56,7 +56,6 @@
<stat_bar label="Ebenen" name="layersdatareceived"/>
<stat_bar label="Tatsächlicher Eingang" name="messagedatain"/>
<stat_bar label="Tatsächlicher Ausgang" name="messagedataout"/>
- <stat_bar label="Ausstehende Vorgänge im VFS" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulator" name="sim">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index c17a5a0f30..d5204a8435 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -31,9 +31,6 @@
<string name="StartupInitializingTextureCache">
Textur-Cache wird initialisiert...
</string>
- <string name="StartupInitializingVFS">
- VFS wird initialisiert...
- </string>
<string name="StartupRequireDriverUpdate">
Grafikinitialisierung fehlgeschlagen. Bitte aktualisieren Sie Ihren Grafiktreiber.
</string>
@@ -73,7 +70,6 @@ LOD-Faktor: [LOD_FACTOR]
Darstellungsqualität: [RENDER_QUALITY]
Erweitertes Beleuchtungsmodell: [GPU_SHADERS]
Texturspeicher: [TEXTURE_MEMORY] MB
-Erstellungszeit VFS (Cache): [VFS_TIME]
</string>
<string name="AboutOSXHiDPI">
HiDPI-Anzeigemodus: [HIDPI]
diff --git a/indra/newview/skins/default/xui/en/floater_360capture.xml b/indra/newview/skins/default/xui/en/floater_360capture.xml
new file mode 100644
index 0000000000..c89489d145
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_360capture.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater can_resize="true"
+ height="400"
+ layout="topleft"
+ min_height="300"
+ min_width="400"
+ name="360capture"
+ help_topic="360capture"
+ save_rect="true"
+ title="360 SNAPSHOT"
+ width="800">
+ <panel layout="topleft"
+ background_visible="true"
+ top="0"
+ follows="left|bottom|top"
+ left="0"
+ width="200"
+ bg_opaque_color="0.195 0.195 0.195 1"
+ background_opaque="true"
+ height="400"
+ name="ui_panel_left">
+ <text
+ follows="top|left|right"
+ height="16"
+ layout="topleft"
+ left="10"
+ top="10"
+ width="100">
+ Quality level
+ </text>
+ <radio_group
+ control_name="360QualitySelection"
+ follows="left|top"
+ height="94"
+ layout="topleft"
+ left_delta="20"
+ name="360_quality_selection"
+ top_pad="0"
+ width="180">
+ <radio_item
+ height="20"
+ label="Preview (fast)"
+ layout="topleft"
+ left="0"
+ name="preview_quality"
+ value="128"
+ tool_tip="Preview quality"
+ top="0"
+ width="100" />
+ <radio_item
+ height="20"
+ label="Medium"
+ layout="topleft"
+ left_delta="0"
+ name="medium_quality"
+ value="512"
+ tool_tip="Medium quality"
+ top_delta="20"
+ width="100" />
+ <radio_item
+ height="20"
+ label="High"
+ layout="topleft"
+ left_delta="0"
+ name="high_quality"
+ value="1024"
+ tool_tip="High quality"
+ top_delta="20"
+ width="100" />
+ <radio_item
+ height="20"
+ label="Maximum"
+ layout="topleft"
+ left_delta="0"
+ name="maximum_quality"
+ value="2048"
+ tool_tip="Maximum quality"
+ top_delta="20"
+ width="100" />
+ </radio_group>
+ <check_box control_name="360CaptureHideAvatars"
+ follows="left|top"
+ height="15"
+ label="Hide all avatars"
+ layout="left"
+ left="10"
+ name="360_hide_avatar"
+ top_delta="0"
+ width="100"/>
+ <button follows="left|top"
+ height="20"
+ label="Create 360 image"
+ layout="topleft"
+ left="10"
+ name="capture_button"
+ top_delta="32"
+ width="180" />
+ <button follows="left|top"
+ height="20"
+ label="Save as..."
+ layout="topleft"
+ left="10"
+ name="save_local_button"
+ top_delta="35"
+ width="180" />
+ </panel>
+ <panel layout="topleft"
+ background_visible="true"
+ top="0"
+ follows="all"
+ left="200"
+ width="600"
+ bg_opaque_color="0.195 0.195 0.195 1"
+ background_opaque="true"
+ height="400"
+ name="ui_panel_right">
+ <web_browser top="10"
+ follows="all"
+ bg_opaque_color="0.225 0.225 0.225 1"
+ left="0"
+ width="590"
+ height="368"
+ name="360capture_contents"
+ trusted_content="true" />
+ <text follows="bottom"
+ layout="topleft"
+ name="statusbar"
+ height="17"
+ left="0"
+ top="382"
+ width="590">
+ Click and drag on the image to pan
+ </text>
+ </panel>
+</floater> \ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index ee730dcb01..c4adf0409d 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -11,12 +11,6 @@
single_instance="true"
title="PREFERENCES"
width="658">
- <floater.string
- name="email_unverified_tooltip">
- Please verify your email to enable IM to Email by visiting
-https://accounts.secondlife.com/change_email/
- </floater.string>
-
<button
follows="right|bottom"
height="23"
diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
index 62cce3a1e3..35d4385487 100644
--- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
@@ -207,12 +207,6 @@
tick_spacing="128.f"
precision="1"
show_bar="false"/>
- <stat_bar name="vfspendingoperations"
- label="VFS Pending Operations"
- orientation="horizontal"
- stat="vfspendingoperations"
- unit_label=" Ops."
- show_bar="false"/>
</stat_view>
</stat_view>
<!--Sim Stats-->
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 832c2ee7da..f441e3cbd7 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -400,7 +400,7 @@
layout="topleft"
name="img_info_border"
top_pad="0"
- right="-10"
+ right="-130"
follows="left|top|right"
left_delta="0"/>
<text
@@ -411,11 +411,10 @@
height="14"
layout="topleft"
left="220"
- right="-20"
halign="left"
name="image_res_text"
top_delta="5"
- width="200">
+ width="250">
[WIDTH]px (width) x [HEIGHT]px (height)
</text>
<text
@@ -423,7 +422,7 @@
font="SansSerifSmall"
height="14"
layout="topleft"
- left="-65"
+ left="-185"
length="1"
halign="right"
name="file_size_label"
@@ -432,4 +431,19 @@
width="50">
[SIZE] KB
</text>
+ <text
+ follows="right|top"
+ font="SansSerifSmall"
+ height="14"
+ layout="topleft"
+ left="-130"
+ length="1"
+ halign="right"
+ name="360_label"
+ text_color="0.3 0.82 1 1"
+ top_delta="0"
+ type="string"
+ width="115">
+ Take a 360 snapshot
+ </text>
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index e4f735740b..f9d44b2c69 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -198,10 +198,6 @@
stat="messagedataout"
decimal_digits="1"
show_history="false"/>
- <stat_bar name="vfspendingoperations"
- label="VFS Pending Operations"
- stat="vfspendingoperations"
- unit_label="Ops."/>
</stat_view>
</stat_view>
diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml
index bc19d6e79f..bdc04a8a78 100644
--- a/indra/newview/skins/default/xui/en/floater_toybox.xml
+++ b/indra/newview/skins/default/xui/en/floater_toybox.xml
@@ -4,7 +4,7 @@
can_dock="false"
can_minimize="false"
can_resize="false"
- height="375"
+ height="430"
help_topic="toybox"
layout="topleft"
legacy_header_height="18"
@@ -45,7 +45,7 @@
Buttons will appear as shown or as icon-only depending on each toolbar's settings.
</text>
<toolbar
- bottom="310"
+ bottom="365"
button_display_mode="icons_with_text"
follows="all"
left="20"
@@ -81,11 +81,11 @@
<panel
bevel_style="none"
border="true"
- bottom="311"
+ bottom="366"
follows="left|bottom|right"
left="20"
right="-20"
- top="311" />
+ top="366" />
<button
follows="left|bottom|right"
height="23"
@@ -94,7 +94,7 @@
layout="topleft"
left="185"
name="btn_clear_all"
- top="330"
+ top="385"
width="130">
<button.commit_callback function="Toybox.ClearAll" />
</button>
@@ -106,7 +106,7 @@
layout="topleft"
left="335"
name="btn_restore_defaults"
- top="330"
+ top="385"
width="130">
<button.commit_callback function="Toybox.RestoreDefaults" />
</button>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0a92bfe2b7..c9fa4324ac 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -733,6 +733,15 @@
function="Floater.Show"
parameter="snapshot" />
</menu_item_call>
+
+<menu_item_call
+ label="360 snapshot"
+ name="Capture 360"
+ shortcut="control|alt|shift|s">
+ <menu_item_call.on_click
+ function="Floater.Show"
+ parameter="360capture" />
+ </menu_item_call>
<menu_item_separator/>
<menu_item_call
label="Place profile"
@@ -3427,6 +3436,14 @@ function="World.EnvPreset"
<menu_item_call.on_click
function="Advanced.DumpRegionObjectCache" />
</menu_item_call>
+
+<menu_item_call
+ label="Interest List: Full Update"
+ name="Interest List: Full Update"
+ shortcut="alt|shift|I">
+ <menu_item_call.on_click
+ function="Advanced.InterestListFullUpdate" />
+ </menu_item_call>
</menu>
<menu
create_jump_keys="true"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index c023cb036e..35bd736d77 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -44,16 +44,6 @@
<check_box
enabled="false"
height="16"
- label="Email me IMs when I'm offline"
- layout="topleft"
- name="send_im_to_email"
- top_pad="6"
- width="330">
- </check_box>
-
- <check_box
- enabled="false"
- height="16"
label="Only friends and groups can call or IM me"
layout="topleft"
name="voice_call_friends_only_check"
@@ -62,6 +52,20 @@
</check_box>
<text
+ font="SansSerifSmall"
+ height="16"
+ layout="topleft"
+ length="1"
+ name="email_settings"
+ skip_link_underline="true"
+ top_pad="6"
+ left_delta="2"
+ type="string"
+ width="350">
+ [https://accounts.secondlife.com/change_email Email me IMs when I'm offline]
+ </text>
+
+ <text
layout="topleft"
left="345"
height="12"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 494cc356a2..eff380ef6e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -17,7 +17,6 @@
<string name="StartupLoading">Loading [APP_NAME]...</string>
<string name="StartupClearingCache">Clearing cache...</string>
<string name="StartupInitializingTextureCache">Initializing texture cache...</string>
- <string name="StartupInitializingVFS">Initializing VFS...</string>
<string name="StartupRequireDriverUpdate">Graphics initialization failed. Please update your graphics driver!</string>
<!-- about dialog/support string-->
@@ -56,9 +55,9 @@ LOD factor: [LOD_FACTOR]
Render quality: [RENDER_QUALITY]
Advanced Lighting Model: [GPU_SHADERS]
Texture memory: [TEXTURE_MEMORY]MB
-VFS (cache) creation time: [VFS_TIME]
+Disk cache: [DISK_CACHE_INFO]
</string>
- <string name="AboutOSXHiDPI">
+ <string name="AboutOSXHiDPI">
HiDPI display mode: [HIDPI]
</string>
<string name="AboutLibs">
@@ -4130,6 +4129,8 @@ Try enclosing path to the editor with double quotes.
<!-- commands -->
+ <string
+name="Command_360_Capture_Label">360 snapshot</string>
<string name="Command_AboutLand_Label">About land</string>
<string name="Command_Appearance_Label">Outfits</string>
<string name="Command_Avatar_Label">Complete avatars</string>
@@ -4160,6 +4161,8 @@ Try enclosing path to the editor with double quotes.
<string name="Command_View_Label">Camera controls</string>
<string name="Command_Voice_Label">Voice settings</string>
+ <string
+name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string>
<string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
<string name="Command_Appearance_Tooltip">Change your avatar</string>
<string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
diff --git a/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml
index f625d5257c..cfc5e524b5 100644
--- a/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/es/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
<stat_bar label="Capas" name="layersdatareceived"/>
<stat_bar label="Entrando ahora" name="messagedatain"/>
<stat_bar label="Saliendo ahora" name="messagedataout"/>
- <stat_bar label="Operaciones VFS pendientes" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulador" name="sim">
diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml
index d1c5e867db..0aec786f25 100644
--- a/indra/newview/skins/default/xui/es/floater_stats.xml
+++ b/indra/newview/skins/default/xui/es/floater_stats.xml
@@ -56,7 +56,6 @@
<stat_bar label="Capas" name="layersdatareceived"/>
<stat_bar label="Entrando ahora" name="messagedatain"/>
<stat_bar label="Saliendo ahora" name="messagedataout"/>
- <stat_bar label="Operaciones VFS pendientes" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulador" name="sim">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 65e3ec8b0f..204fbb1002 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -22,9 +22,6 @@
<string name="StartupInitializingTextureCache">
Iniciando la caché de las texturas...
</string>
- <string name="StartupInitializingVFS">
- Iniciando VFS...
- </string>
<string name="StartupRequireDriverUpdate">
Error de inicialización de gráficos. Actualiza tu controlador de gráficos.
</string>
@@ -65,7 +62,6 @@ Factor LOD: [LOD_FACTOR]
Calidad de renderización: [RENDER_QUALITY]
Modelo de iluminación avanzado: [GPU_SHADERS]
Memoria de textura: [TEXTURE_MEMORY]MB
-VFS (cache) hora de creación: [VFS_TIME]
</string>
<string name="AboutOSXHiDPI">
Modo de visualización HiDPi: [HIDPI]
diff --git a/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml
index 62830054bf..3889b13f0c 100644
--- a/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/fr/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
<stat_bar label="Couches" name="layersdatareceived"/>
<stat_bar label="Arrivés" name="messagedatain"/>
<stat_bar label="Sortis" name="messagedataout"/>
- <stat_bar label="Opérations VFS en attente" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulateur" name="sim">
diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml
index fae17e3608..d0f7f42939 100644
--- a/indra/newview/skins/default/xui/fr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/fr/floater_stats.xml
@@ -56,7 +56,6 @@
<stat_bar label="Couches" name="layersdatareceived"/>
<stat_bar label="Arrivés" name="messagedatain"/>
<stat_bar label="Sortis" name="messagedataout"/>
- <stat_bar label="Opérations VFS en attente" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulateur" name="sim">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 7279ee95c3..be9d916a5d 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -31,9 +31,6 @@
<string name="StartupInitializingTextureCache">
Initialisation du cache des textures...
</string>
- <string name="StartupInitializingVFS">
- Initialisation VFS...
- </string>
<string name="StartupRequireDriverUpdate">
Échec d&apos;initialisation des graphiques. Veuillez mettre votre pilote graphique à jour.
</string>
@@ -74,7 +71,6 @@ Facteur LOD (niveau de détail) : [LOD_FACTOR]
Qualité de rendu : [RENDER_QUALITY]
Modèle d’éclairage avancé : [GPU_SHADERS]
Mémoire textures : [TEXTURE_MEMORY] Mo
-Heure de création VFS (cache) : [VFS_TIME]
</string>
<string name="AboutOSXHiDPI">
Mode d&apos;affichage HiDPI : [HIDPI]
diff --git a/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml
index ca18812eb7..efceb05298 100644
--- a/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/it/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
<stat_bar label="Livelli" name="layersdatareceived"/>
<stat_bar label="Effettivi in ingresso" name="messagedatain"/>
<stat_bar label="Effettivi in uscita" name="messagedataout"/>
- <stat_bar label="Operazioni VFS in sospeso" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulatore" name="sim">
diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml
index 7ef13aa37f..6434c3b66b 100644
--- a/indra/newview/skins/default/xui/it/floater_stats.xml
+++ b/indra/newview/skins/default/xui/it/floater_stats.xml
@@ -56,7 +56,6 @@
<stat_bar label="Livelli" name="layersdatareceived"/>
<stat_bar label="Effettivi in ingresso" name="messagedatain"/>
<stat_bar label="Effettivi in uscita" name="messagedataout"/>
- <stat_bar label="Operazioni VFS in sospeso" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulatore" name="sim">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index ead9b53450..fb49b87ef7 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -28,9 +28,6 @@
<string name="StartupInitializingTextureCache">
Inizializzazione della cache texture...
</string>
- <string name="StartupInitializingVFS">
- Inizializzazione VFS...
- </string>
<string name="StartupRequireDriverUpdate">
Inizializzazione grafica non riuscita. Aggiorna il driver della scheda grafica!
</string>
@@ -71,7 +68,6 @@ Fattore livello di dettaglio: [LOD_FACTOR]
Qualità di rendering: [RENDER_QUALITY]
Modello illuminazione avanzato: [GPU_SHADERS]
Memoria texture: [TEXTURE_MEMORY]MB
-Data/ora creazione VFS (cache): [VFS_TIME]
</string>
<string name="AboutOSXHiDPI">
Modalità display HiDPI: [HIDPI]
diff --git a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
index f6edce026f..f348ce3c4d 100644
--- a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
<stat_bar label="レイヤー" name="layersdatareceived"/>
<stat_bar label="実際の受信" name="messagedatain"/>
<stat_bar label="実際の送信" name="messagedataout"/>
- <stat_bar label="VFS 保留中の操作" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="シミュレーター" name="sim">
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index 3bc343639b..1da0e5ebc9 100644
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
@@ -56,7 +56,6 @@
<stat_bar label="レイヤー" name="layersdatareceived"/>
<stat_bar label="実際の受信" name="messagedatain"/>
<stat_bar label="実際の送信" name="messagedataout"/>
- <stat_bar label="VFS 保留中の操作" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="シミュレーター" name="sim">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 813c9d5aa9..fffc49cc76 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -31,9 +31,6 @@
<string name="StartupInitializingTextureCache">
テクスチャキャッシュを初期化中です...
</string>
- <string name="StartupInitializingVFS">
- VFS を初期化中です...
- </string>
<string name="StartupRequireDriverUpdate">
グラフィックを初期化できませんでした。グラフィックドライバを更新してください。
</string>
@@ -74,7 +71,6 @@ LOD 係数: [LOD_FACTOR]
描画の質: [RENDER_QUALITY]
高度なライティングモデル: [GPU_SHADERS]
テクスチャメモリ: [TEXTURE_MEMORY]MB
-VFS(キャッシュ)作成時間: [VFS_TIME]
</string>
<string name="AboutOSXHiDPI">
HiDPI 表示モード: [HIDPI]
diff --git a/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
index 6fdc7e19f6..8f5d0c5c70 100644
--- a/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/pl/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
<stat_bar name="layersdatareceived" label="Warstwy" />
<stat_bar name="messagedatain" label="Aktualna il. wchodząca" />
<stat_bar name="messagedataout" label="Aktualna il. wychodząca" />
- <stat_bar name="vfspendingoperations" label="Operacje oczekujące VFS" unit_label=" op." />
</stat_view>
</stat_view>
<stat_view name="sim" label="Symulator">
diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml
index 5dd7d19bab..21e37717c2 100644
--- a/indra/newview/skins/default/xui/pl/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pl/floater_stats.xml
@@ -55,7 +55,6 @@
<stat_bar label="Warstwy" name="layersdatareceived" />
<stat_bar label="Aktualna il. wchodząca" name="messagedatain" />
<stat_bar label="Aktualna il. wychodząca" name="messagedataout" />
- <stat_bar label="Operacje oczekujące VFS" name="vfspendingoperations" />
</stat_view>
</stat_view>
<stat_view label="Symulator" name="sim">
diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml
index 9efe8c3a81..2b182dc3cc 100644
--- a/indra/newview/skins/default/xui/pl/strings.xml
+++ b/indra/newview/skins/default/xui/pl/strings.xml
@@ -15,9 +15,6 @@
<string name="StartupInitializingTextureCache">
Inicjowanie bufora danych tekstur...
</string>
- <string name="StartupInitializingVFS">
- Inicjowanie wirtualnego systemu plików...
- </string>
<string name="StartupRequireDriverUpdate">
Nie można zainicjować grafiki. Zaktualizuj sterowniki!
</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml
index 027e1ef311..dbaab1d782 100644
--- a/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/pt/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
<stat_bar label="Layers" name="layersdatareceived"/>
<stat_bar label="Actual In" name="messagedatain"/>
<stat_bar label="Actual Out" name="messagedataout"/>
- <stat_bar label="Operações pendentes do VFS" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulator" name="sim">
diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml
index f41fe17778..3253984268 100644
--- a/indra/newview/skins/default/xui/pt/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pt/floater_stats.xml
@@ -56,7 +56,6 @@
<stat_bar label="Layers" name="layersdatareceived"/>
<stat_bar label="Actual In" name="messagedatain"/>
<stat_bar label="Actual Out" name="messagedataout"/>
- <stat_bar label="Operações pendentes do VFS" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simulator" name="sim">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index be1c4a5a22..7c593ab3be 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -22,9 +22,6 @@
<string name="StartupInitializingTextureCache">
Iniciando cache de texturas...
</string>
- <string name="StartupInitializingVFS">
- Iniciando VFS...
- </string>
<string name="StartupRequireDriverUpdate">
Falha na inicialização dos gráficos. Atualize seu driver gráfico!
</string>
@@ -65,7 +62,6 @@ LOD fator: [LOD_FACTOR]
Qualidade de renderização: [RENDER_QUALITY]
Modelo avançado de luzes: [GPU_SHADERS]
Memória de textura: [TEXTURE_MEMORY]MB
-VFS (cache) tempo de criação: [VFS_TIME]
</string>
<string name="AboutOSXHiDPI">
HiDPI modo de exibição: [HIDPI]
diff --git a/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml
index a101e62627..c4f432023c 100644
--- a/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/ru/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
<stat_bar label="Слои" name="layersdatareceived"/>
<stat_bar label="Действительный ввод" name="messagedatain"/>
<stat_bar label="Действительный вывод" name="messagedataout"/>
- <stat_bar label="Ожидающие операции VFS" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Симулятор" name="sim">
diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml
index 10e9f5a7f4..a7d26029c2 100644
--- a/indra/newview/skins/default/xui/ru/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ru/floater_stats.xml
@@ -56,7 +56,6 @@
<stat_bar label="Слои" name="layersdatareceived"/>
<stat_bar label="Действительный ввод" name="messagedatain"/>
<stat_bar label="Действительный вывод" name="messagedataout"/>
- <stat_bar label="Ожидающие операции VFS" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Симулятор" name="sim">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 6b1dae19a9..b3edd4931c 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -31,9 +31,6 @@
<string name="StartupInitializingTextureCache">
Инициализация кэша текстур...
</string>
- <string name="StartupInitializingVFS">
- Инициализация виртуальной файловой системы...
- </string>
<string name="StartupRequireDriverUpdate">
Ошибка инициализации графики. Обновите графический драйвер!
</string>
@@ -74,7 +71,6 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
Качество визуализации: [RENDER_QUALITY]
Расширенная модель освещения: [GPU_SHADERS]
Память текстур: [TEXTURE_MEMORY] МБ
-Время создания VFS (кэш): [VFS_TIME]
</string>
<string name="AboutOSXHiDPI">
Режим отображения HiDPI: [HIDPI]
diff --git a/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml
index ae0a94595d..7d5f4adb02 100644
--- a/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/tr/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
<stat_bar label="Katmanlar" name="layersdatareceived"/>
<stat_bar label="Gerçekte Gelen" name="messagedatain"/>
<stat_bar label="Gerçekte Giden" name="messagedataout"/>
- <stat_bar label="VFS Bekleyen İşlemler" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simülatör" name="sim">
diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml
index 1ae42ad382..bd36d4916f 100644
--- a/indra/newview/skins/default/xui/tr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/tr/floater_stats.xml
@@ -56,7 +56,6 @@
<stat_bar label="Katmanlar" name="layersdatareceived"/>
<stat_bar label="Gerçekte Gelen" name="messagedatain"/>
<stat_bar label="Gerçekte Giden" name="messagedataout"/>
- <stat_bar label="VFS Bekleyen İşlemler" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="Simülatör" name="sim">
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 44954dee50..74a6b3cac3 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -31,9 +31,6 @@
<string name="StartupInitializingTextureCache">
Doku önbelleği başlatılıyor...
</string>
- <string name="StartupInitializingVFS">
- VFS Başlatılıyor...
- </string>
<string name="StartupRequireDriverUpdate">
Grafik başlatma başarılamadı. Lütfen grafik sürücünüzü güncelleştirin!
</string>
@@ -74,7 +71,6 @@ LOD faktörü: [LOD_FACTOR]
İşleme kalitesi: [RENDER_QUALITY]
Gelişmiş Aydınlatma Modeli: [GPU_SHADERS]
Doku belleği: [TEXTURE_MEMORY]MB
-VFS (önbellek) oluşturma saati: [VFS_TIME]
</string>
<string name="AboutOSXHiDPI">
HiDPI görüntü modu: [HIDPI]
diff --git a/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml
index 1a5c20abeb..20344e299f 100644
--- a/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_scene_load_stats.xml
@@ -29,7 +29,6 @@
<stat_bar label="層次" name="layersdatareceived"/>
<stat_bar label="實入" name="messagedatain"/>
<stat_bar label="實出" name="messagedataout"/>
- <stat_bar label="VFS 待行作業" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="模擬器" name="sim">
diff --git a/indra/newview/skins/default/xui/zh/floater_stats.xml b/indra/newview/skins/default/xui/zh/floater_stats.xml
index f06eb5e78f..e233ece527 100644
--- a/indra/newview/skins/default/xui/zh/floater_stats.xml
+++ b/indra/newview/skins/default/xui/zh/floater_stats.xml
@@ -56,7 +56,6 @@
<stat_bar label="層次" name="layersdatareceived"/>
<stat_bar label="實入" name="messagedatain"/>
<stat_bar label="實出" name="messagedataout"/>
- <stat_bar label="VFS 待行作業" name="vfspendingoperations"/>
</stat_view>
</stat_view>
<stat_view label="模擬器" name="sim">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 136a2ceae1..a8d5fd90bb 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -31,9 +31,6 @@
<string name="StartupInitializingTextureCache">
正在初始化材質快取...
</string>
- <string name="StartupInitializingVFS">
- VFS 初始化中...
- </string>
<string name="StartupRequireDriverUpdate">
顯像初始化失敗。 請更新你的顯像卡驅動程式!
</string>
@@ -74,7 +71,6 @@
呈像品質:[RENDER_QUALITY]
進階照明模型:[GPU_SHADERS]
材質記憶體:[TEXTURE_MEMORY]MB
-VFS(快取)建立時間:[VFS_TIME]
</string>
<string name="AboutOSXHiDPI">
HiDPI顯示模式:[HIDPI]
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 6fcd1e84e8..a814bd2849 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -69,7 +69,6 @@ class ViewerManifest(LLManifest):
self.exclude("logcontrol-dev.xml")
self.path("*.ini")
self.path("*.xml")
- self.path("*.db2")
# include the entire shaders directory recursively
self.path("shaders")
@@ -158,18 +157,12 @@ class ViewerManifest(LLManifest):
self.path("*/xui/*/widgets/*.xml")
self.path("*/*.xml")
- # Local HTML files (e.g. loading screen)
- # The claim is that we never use local html files any
- # longer. But rather than commenting out this block, let's
- # rename every html subdirectory as html.old. That way, if
- # we're wrong, a user actually does have the relevant
- # files; s/he just needs to rename every html.old
- # directory back to html to recover them.
- with self.prefix(src="*/html", dst="*/html.old"):
- self.path("*.png")
- self.path("*/*/*.html")
- self.path("*/*/*.gif")
-
+ # Update: 2017-11-01 CP Now we store app code in the html folder
+ # Initially the HTML/JS code to render equirectangular
+ # images for the 360 capture feature but more to follow.
+ with self.prefix(src="*/html", dst="*/html"):
+ self.path("*/*/*/*.js")
+ self.path("*/*/*.html")
#build_data.json. Standard with exception handling is fine. If we can't open a new file for writing, we have worse problems
#platform is computed above with other arg parsing