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

LLVOAvatar class members reorganized to line up with V2 better. Added accessors from v2 where applicable. mBakedTextureData renamed to mBakedTextureDatas

Browse Source
This commit is contained in:
Shyotl
2011-05-14 12:38:47 -05:00
parent 8df737b488
commit 4e47446be1
20 changed files with 1375 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llviewermenu.cpp
View File

@@ -3498,7 +3498,7 @@ class LLSelfSitOrStand : public view_listener_t
{
bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
{
if (gAgent.getAvatarObject() && gAgent.getAvatarObject()->mIsSitting)
if (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting())
{
// [RLVa:KB] - Alternate: Snowglobe-1.3.X | Checked: 2009-12-29 (RLVa-1.1.0k) | Added: RLVa-1.1.0k | OK
if (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
@@ -3540,7 +3540,7 @@ class LLSelfEnableSitOrStand : public view_listener_t
stand_text = param.substr(offset+1);
}
if (gAgent.getAvatarObject() && gAgent.getAvatarObject()->mIsSitting)
if (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting())
{
// [RLVa:KB] - Alternate: Snowglobe-1.3.X | Checked: 2009-12-29 (RLVa-1.1.0k) | Added: RLVa-1.1.0k | OK
new_value &= (!gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT));
@@ -3757,7 +3757,7 @@ void handle_force_ground_sit(void*)
{
if (gAgent.getAvatarObject())
{
if(!gAgent.getAvatarObject()->mIsSitting)
if(!gAgent.getAvatarObject()->isSitting())
{
gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
}
@@ -3958,7 +3958,7 @@ bool handle_sit_or_stand()
// [RLVa:KB] - Checked: 2010-08-29 (RLVa-1.1.3b) | Added: RLVa-1.2.1c | OK
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_STANDTP)) && (gAgent.getAvatarObject()) )
{
if (gAgent.getAvatarObject()->mIsSitting)
if (gAgent.getAvatarObject()->isSitting())
{
if (gRlvHandler.canStand())
gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
@@ -4075,7 +4075,7 @@ class LLWorldEnableFly : public view_listener_t
BOOL sitting = FALSE;
if (gAgent.getAvatarObject())
{
sitting = gAgent.getAvatarObject()->mIsSitting;
sitting = gAgent.getAvatarObject()->isSitting();
}
gMenuHolder->findControl(userdata["control"].asString())->setValue(!sitting);
return true;
@@ -5158,7 +5158,7 @@ BOOL sitting_on_selection()
return FALSE;
}
return (avatar->mIsSitting && avatar->getRoot() == root_object);
return (avatar->isSitting() && avatar->getRoot() == root_object);
}
class LLToolsSaveToInventory : public view_listener_t
@@ -6004,7 +6004,7 @@ class LLWorldSitOnGround : public view_listener_t
{
if (gAgent.getAvatarObject())
{
if(!gAgent.getAvatarObject()->mIsSitting)
if(!gAgent.getAvatarObject()->isSitting())
{
gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
}