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

Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting

Browse Source 
Conflicts:
	indra/newview/llviewerwindow.cpp - Also two compile fixes.
This commit is contained in:
Lirusaito
2013-04-10 13:26:48 -04:00
parent fd9f8fa71f eb25270df0
commit 8c49716eae
93 changed files with 1323 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llagent.cpp
View File

@@ -2276,7 +2276,7 @@ void LLAgent::setStartPosition( U32 location_id )
if (isAgentAvatarValid())
{
// the z height is at the agent's feet
agent_pos.mV[VZ] -= 0.5f * gAgentAvatarp->mBodySize.mV[VZ];
agent_pos.mV[VZ] -= 0.5f * (gAgentAvatarp->mBodySize.mV[VZ] + gAgentAvatarp->mAvatarOffset.mV[VZ]);
}
agent_pos.mV[VX] = llclamp( agent_pos.mV[VX], INSET, REGION_WIDTH - INSET );
@@ -2842,9 +2842,9 @@ void LLAgent::buildFullnameAndTitle(std::string& name) const
}
}
BOOL LLAgent::isInGroup(const LLUUID& group_id) const
BOOL LLAgent::isInGroup(const LLUUID& group_id, BOOL ignore_god_mode /* FALSE */) const
{
if (isGodlike())
if (!ignore_god_mode && isGodlike())
return true;
S32 count = mGroups.count();
@@ -4496,23 +4496,7 @@ void LLAgent::sendAgentSetAppearance()
// NOTE -- when we start correcting all of the other Havok geometry
// to compensate for the COLLISION_TOLERANCE ugliness we will have
// to tweak this number again
LLVector3 body_size = gAgentAvatarp->mBodySize;
static LLCachedControl<F32> x_off("AscentAvatarXModifier");
static LLCachedControl<F32> y_off("AscentAvatarYModifier");
static LLCachedControl<F32> z_off("AscentAvatarZModifier");
body_size.mV[VX] += x_off;
body_size.mV[VY] += y_off;
// [RLVa:KB] - Checked: 2010-10-11 (RLVa-1.2.0e) | Added: RLVa-1.2.0e
if (rlv_handler_t::isEnabled())
{
F32 rlvz_off = RlvSettings::getAvatarOffsetZ();
body_size.mV[VZ] += fabs(rlvz_off) ? rlvz_off : z_off;
}
else
// [/RLVa:KB]
body_size.mV[VZ] += z_off;
LLVector3 body_size = gAgentAvatarp->mBodySize + gAgentAvatarp->getLegacyAvatarOffset();
msg->addVector3Fast(_PREHASH_Size, body_size);