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; }