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

I'm dumb for breaking head again

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-16 02:57:47 -03:00
parent f043ba484c
commit 01dd55579a
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
indra/newview/llagent.cpp
View File

@@ -220,17 +220,19 @@ LLAgent gAgent;
// Statics
//
// <edit>
// For MapBlockReply funk 'cause I dunno what I'm doing
BOOL LLAgent::lure_show = FALSE;
std::string LLAgent::lure_name;
LLVector3d LLAgent::lure_posglobal;
U16 LLAgent::lure_global_x;
U16 LLAgent::lure_global_y;
int LLAgent::lure_x;
int LLAgent::lure_y;
int LLAgent::lure_z;
std::string LLAgent::lure_maturity;
// <edit>
// For MapBlockReply funk 'cause I dunno what I'm doing
/* not *quite* there yet, and I don't want to break head.
BOOL LLAgent::lure_show = FALSE;
std::string LLAgent::lure_name;
LLVector3d LLAgent::lure_posglobal;
U16 LLAgent::lure_global_x;
U16 LLAgent::lure_global_y;
int LLAgent::lure_x;
int LLAgent::lure_y;
int LLAgent::lure_z;
std::string LLAgent::lure_maturity;
*/
// </edit>
const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f;
@@ -770,11 +772,11 @@ void LLAgent::movePitch(S32 direction)
// Does this parcel allow you to fly?
BOOL LLAgent::canFly()
{
if (isGodlike()) return TRUE;
// <edit>
if(gSavedSettings.getBOOL("AlwaysAllowFly")) return TRUE;
// </edit>
if (isGodlike()) return TRUE;
// <edit>
if(gSavedSettings.getBOOL("AlwaysAllowFly")) return TRUE;
// </edit>
LLViewerRegion* regionp = getRegion();
if (regionp && regionp->getBlockFly()) return FALSE;
@@ -1883,10 +1885,10 @@ void LLAgent::cameraZoomIn(const F32 fraction)
LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE );
if (new_distance > max_distance)
{
// <edit> screw cam constraints
//new_distance = max_distance;
// </edit>
{
// <edit> screw cam constraints
//new_distance = max_distance;
// </edit>
/*
// Unless camera is unlocked