diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index e8d97a574..b1c6606dc 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -38,26 +38,26 @@ else (STANDALONE) debug libboost_thread-mt-gd) elseif (LINUX) set(Boost_CONTEXT_LIBRARY - optimized boost_context-mt.a - debug boost_context-mt-d.a) + optimized boost_context-mt + debug boost_context-mt-d) set(Boost_FILESYSTEM_LIBRARY - optimized boost_filesystem-mt.a - debug boost_filesystem-mt-d.a) + optimized boost_filesystem-mt + debug boost_filesystem-mt-d) set(Boost_PROGRAM_OPTIONS_LIBRARY - optimized boost_program_options-mt.a - debug boost_program_options-mt-d.a) + optimized boost_program_options-mt + debug boost_program_options-mt-d) set(Boost_REGEX_LIBRARY - optimized boost_regex-mt.a - debug boost_regex-mt-d.a) + optimized boost_regex-mt + debug boost_regex-mt-d) set(Boost_SIGNALS_LIBRARY - optimized boost_signals-mt.a - debug boost_signals-mt-d.a) + optimized boost_signals-mt + debug boost_signals-mt-d) set(Boost_SYSTEM_LIBRARY - optimized boost_system-mt.a - debug boost_system-mt-d.a) + optimized boost_system-mt + debug boost_system-mt-d) set(Boost_THREAD_LIBRARY - optimized boost_thread-mt.a - debug boost_thread-mt-d.a) + optimized boost_thread-mt + debug boost_thread-mt-d) elseif (DARWIN) set(Boost_CONTEXT_LIBRARY optimized boost_context-mt diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8b3a3524a..eceee5233 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -220,7 +220,7 @@ 100 - zmm_mlfov + ExodusAlternativeFOV Comment Adjusted when scrolling back and forth while holding rightclick in mouselook (Zoomed in < 1.037 < Zoomed out) diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp index 3f755dbf2..46ea53339 100644 --- a/indra/newview/lltoolcomp.cpp +++ b/indra/newview/lltoolcomp.cpp @@ -824,7 +824,7 @@ BOOL LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask) } else mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV(); - mTargetFOV = gSavedSettings.getF32("zmm_mlfov"); + mTargetFOV = gSavedSettings.getF32("ExodusAlternativeFOV"); mTimerFOV.start(); return TRUE; @@ -837,7 +837,7 @@ BOOL LLToolCompGun::handleScrollWheel(S32 x, S32 y, S32 clicks) mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV(); gSavedSettings.setF32( - "zmm_mlfov", + "ExodusAlternativeFOV", mTargetFOV = clicks > 0 ? llclamp(mTargetFOV += (0.05f * clicks), 0.1f, 3.0f) : llclamp(mTargetFOV -= (0.05f * -clicks), 0.1f, 3.0f) diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp index a5d1a9c28..37db6e081 100644 --- a/indra/newview/llworldmap.cpp +++ b/indra/newview/llworldmap.cpp @@ -702,9 +702,12 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID& case MAP_ITEM_LAND_FOR_SALE: // land for sale case MAP_ITEM_LAND_FOR_SALE_ADULT: // adult land for sale { - new_item.setTooltip(llformat("%d sq. m. %s%d", extra, + new_item.setTooltip(llformat("%d sq. m. %s%d (%.1f %s/sq. m.)", extra, gHippoGridManager->getConnectedGrid()->getCurrencySymbol().c_str(), - extra2)); + extra2, + (extra > 0) ? ((F32)extra2 / extra) : 0.f, + gHippoGridManager->getConnectedGrid()->getCurrencySymbol().c_str())); + if (type == MAP_ITEM_LAND_FOR_SALE) { siminfo->insertLandForSale(new_item); @@ -712,11 +715,11 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID& else if (type == MAP_ITEM_LAND_FOR_SALE_ADULT) { siminfo->insertLandForSaleAdult(new_item); - } - break; } - case MAP_ITEM_CLASSIFIED: // classifieds - { + break; + } + case MAP_ITEM_CLASSIFIED: // classifieds + { //DEPRECATED: no longer used break; } diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index cff3f057f..5934a0b5c 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -827,6 +827,15 @@ class Linux_i686Manifest(LinuxManifest): self.path("libtcmalloc_minimal.so.0") self.path("libtcmalloc_minimal.so.0.2.2") + # Boost + self.path("libboost_context-mt.so.*") + self.path("libboost_filesystem-mt.so.*") + self.path("libboost_program_options-mt.so.*") + self.path("libboost_regex-mt.so.*") + self.path("libboost_signals-mt.so.*") + self.path("libboost_system-mt.so.*") + self.path("libboost_thread-mt.so.*") + if 'extra_libraries' in self.args: path_list = self.args['extra_libraries'].split('|') for path in path_list: @@ -870,6 +879,15 @@ class Linux_x86_64Manifest(LinuxManifest): self.path("libpng*.so*") self.path("libz.so*") + # Boost + self.path("libboost_context-mt.so.*") + self.path("libboost_filesystem-mt.so.*") + self.path("libboost_program_options-mt.so.*") + self.path("libboost_regex-mt.so.*") + self.path("libboost_signals-mt.so.*") + self.path("libboost_system-mt.so.*") + self.path("libboost_thread-mt.so.*") + # OpenAL self.path("libopenal.so*") self.path("libalut.so*") diff --git a/install.xml b/install.xml index cd0bedaee..b4e452428 100644 --- a/install.xml +++ b/install.xml @@ -256,16 +256,16 @@ linux md5sum - 8817faad001cea8f92546f30b5fcbbfa + 8a1017e1935ae3c88dea7f4552573f53 url - https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux-20131007.tar.bz2 + https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux-20131219.tar.bz2 linux64 md5sum - 1d23d74f2f475945ec4d24f70a27561d + 446dbefb0d3dd0bd93f30b4ef1eaa67b url - https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux64-20131007.tar.bz2 + https://bitbucket.org/SingularityViewer/libraries/downloads/colladadom-2.2-linux64-20131219.tar.bz2 windows