Merge branch 'master' of github.com:Beeks/Ascent

This commit is contained in:
CharleyLevenque
2010-09-01 18:05:09 -04:00
5 changed files with 133 additions and 11 deletions

View File

@@ -793,7 +793,8 @@ BOOL LLAgent::canFly()
if (isGodlike()) return TRUE;
// <edit>
if(gSavedSettings.getBOOL("AlwaysAllowFly")) return TRUE;
if(gSavedSettings.getBOOL("AscentFlyAlwaysEnabled"))
return TRUE;
// </edit>
LLViewerRegion* regionp = getRegion();