Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2013-12-20 04:59:59 +01:00
parent facd5a76c5 85943b8a03
commit 4a2168cf48
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@@ -220,7 +220,7 @@
<integer>100</integer> <integer>100</integer>
</map> </map>
<key>zmm_mlfov</key> <key>ExodusAlternativeFOV</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Adjusted when scrolling back and forth while holding rightclick in mouselook (Zoomed in &lt; 1.037 &lt; Zoomed out)</string> <string>Adjusted when scrolling back and forth while holding rightclick in mouselook (Zoomed in &lt; 1.037 &lt; Zoomed out)</string>

4
indra/newview/lltoolcomp.cpp
View File

@@ -824,7 +824,7 @@ BOOL LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask)
} }
else mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV(); else mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV();
mTargetFOV = gSavedSettings.getF32("zmm_mlfov"); mTargetFOV = gSavedSettings.getF32("ExodusAlternativeFOV");
mTimerFOV.start(); mTimerFOV.start();
return TRUE; return TRUE;
@@ -837,7 +837,7 @@ BOOL LLToolCompGun::handleScrollWheel(S32 x, S32 y, S32 clicks)
mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV(); mStartFOV = LLViewerCamera::getInstance()->getDefaultFOV();
gSavedSettings.setF32( gSavedSettings.setF32(
"zmm_mlfov", "ExodusAlternativeFOV",
mTargetFOV = clicks > 0 ? mTargetFOV = clicks > 0 ?
llclamp(mTargetFOV += (0.05f * clicks), 0.1f, 3.0f) : llclamp(mTargetFOV += (0.05f * clicks), 0.1f, 3.0f) :
llclamp(mTargetFOV -= (0.05f * -clicks), 0.1f, 3.0f) llclamp(mTargetFOV -= (0.05f * -clicks), 0.1f, 3.0f)

15
indra/newview/llworldmap.cpp
View File

@@ -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: // land for sale
case MAP_ITEM_LAND_FOR_SALE_ADULT: // adult 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(), 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) if (type == MAP_ITEM_LAND_FOR_SALE)
{ {
siminfo->insertLandForSale(new_item); 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) else if (type == MAP_ITEM_LAND_FOR_SALE_ADULT)
{ {
siminfo->insertLandForSaleAdult(new_item); siminfo->insertLandForSaleAdult(new_item);
}
break;
} }
case MAP_ITEM_CLASSIFIED: // classifieds break;
{ }
case MAP_ITEM_CLASSIFIED: // classifieds
{
//DEPRECATED: no longer used //DEPRECATED: no longer used
break; break;
} }