summaryrefslogtreecommitdiff
path: root/indra/newview/llprogressview.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2024-02-01 23:00:53 +0200
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-02-09 01:31:50 +0200
commit762855f2554393dd3bcacd9b5d205765409f6a95 (patch)
tree21d57c479032ce094108564e595d2f31f6c7a876 /indra/newview/llprogressview.cpp
parent4cec3133197cd39efd607b82169a85f56c77aa68 (diff)
SL-19585 Try replacing fmod with openal
Since now VLC is responsible for played parcel media (should be since SL-19042) should be possible to switch remaining audio to OpenAL with no loss of functionality
Diffstat (limited to 'indra/newview/llprogressview.cpp')
-rw-r--r--indra/newview/llprogressview.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 416848f9af..6eb55c8b6a 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -399,21 +399,6 @@ void LLProgressView::initLogos()
temp_str += gDirUtilp->getDirDelimiter();
-#ifdef LL_FMODSTUDIO
- // original image size is 264x96, it is on longer side but
- // with no internal paddings so it gets additional padding
- icon_width = 77;
- icon_height = 21;
- S32 pad_fmod_y = 4;
- texture_start_x++;
- loadLogo(temp_str + "fmod_logo.png",
- image_codec,
- LLRect(texture_start_x, texture_start_y + pad_fmod_y + icon_height, texture_start_x + icon_width, texture_start_y + pad_fmod_y),
- default_clip,
- default_clip);
-
- texture_start_x += icon_width + default_pad + 1;
-#endif //LL_FMODSTUDIO
#ifdef LL_HAVOK
// original image size is 342x113, central element is on a larger side
// plus internal padding, so it gets slightly more height than desired 32