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

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/llvovolume.cpp
	indra/newview/skins/default/xui/fr/panel_overlaybar.xml
This commit is contained in:
Siana Gearz
2012-08-09 00:42:23 +02:00
parent f3e7340118 1a6c00ca8b
commit de74443d76
74 changed files with 5078 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
indra/newview/llviewerobject.cpp
View File

@@ -457,7 +457,7 @@ void LLViewerObject::dump() const
/*
llinfos << "Velocity: " << getVelocity() << llendl;
llinfos << "AnyOwner: " << permAnyOwner() << " YouOwner: " << permYouOwner() << " Edit: " << mPermEdit << llendl;
llinfos << "UsePhysics: " << usePhysics() << " CanSelect " << mbCanSelect << " UserSelected " << mUserSelected << llendl;
llinfos << "UsePhysics: " << flagUsePhysics() << " CanSelect " << mbCanSelect << " UserSelected " << mUserSelected << llendl;
llinfos << "AppAngle: " << mAppAngle << llendl;
llinfos << "PixelArea: " << mPixelArea << llendl;
@@ -2065,6 +2065,8 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
//
//
// If we're going to skip this message, why are we
// doing all the parenting, etc above?
U32 packet_id = mesgsys->getCurrentRecvPacketID();
if (packet_id < mLatestRecvPacketID &&
mLatestRecvPacketID - packet_id < 65536)
@@ -2125,12 +2127,11 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
}
}
if (new_rot != mLastRot
if (new_rot != getRotation()
|| new_angv != old_angv)
{
if (new_rot != mLastRot)
if (new_rot != getRotation())
{
mLastRot = new_rot;
setRotation(new_rot);
}
@@ -4151,38 +4152,6 @@ void LLViewerObject::sendMaterialUpdate() const
}
// formerly send_object_rotation
void LLViewerObject::sendRotationUpdate() const
{
LLViewerRegion* regionp = getRegion();
if(!regionp) return;
gMessageSystem->newMessageFast(_PREHASH_ObjectRotation);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, mLocalID);
gMessageSystem->addQuatFast(_PREHASH_Rotation, getRotationEdit());
//llinfos << "Sent rotation " << getRotationEdit() << llendl;
gMessageSystem->sendReliable( regionp->getHost() );
}
/* Obsolete, we use MultipleObjectUpdate instead
//// formerly send_object_position_global
//void LLViewerObject::sendPositionUpdate() const
//{
// gMessageSystem->newMessageFast(_PREHASH_ObjectPosition);
// gMessageSystem->nextBlockFast(_PREHASH_AgentData);
// gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
// gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
// gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
// gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, mLocalID );
// gMessageSystem->addVector3Fast(_PREHASH_Position, getPositionRegion());
// LLViewerRegion* regionp = getRegion();
// gMessageSystem->sendReliable(regionp->getHost());
//}
*/
//formerly send_object_shape(LLViewerObject *object)
void LLViewerObject::sendShapeUpdate()
{
@@ -5267,7 +5236,7 @@ BOOL LLViewerObject::permAnyOwner() const
{
if (isRootEdit())
{
return ((mFlags & FLAGS_OBJECT_ANY_OWNER) != 0);
return flagObjectAnyOwner();
}
else
{
@@ -5289,7 +5258,7 @@ BOOL LLViewerObject::permYouOwner() const
return TRUE;
}
# endif
return ((mFlags & FLAGS_OBJECT_YOU_OWNER) != 0);
return flagObjectYouOwner();
#endif
}
else
@@ -5303,7 +5272,7 @@ BOOL LLViewerObject::permGroupOwner() const
{
if (isRootEdit())
{
return ((mFlags & FLAGS_OBJECT_GROUP_OWNED) != 0);
return flagObjectGroupOwned();
}
else
{
@@ -5326,7 +5295,7 @@ BOOL LLViewerObject::permOwnerModify() const
return TRUE;
}
# endif
return ((mFlags & FLAGS_OBJECT_OWNER_MODIFY) != 0);
return flagObjectOwnerModify();
#endif
}
else
@@ -5350,7 +5319,7 @@ BOOL LLViewerObject::permModify() const
return TRUE;
}
# endif
return ((mFlags & FLAGS_OBJECT_MODIFY) != 0);
return flagObjectModify();
#endif
}
else
@@ -5374,7 +5343,7 @@ BOOL LLViewerObject::permCopy() const
return TRUE;
}
# endif
return ((mFlags & FLAGS_OBJECT_COPY) != 0);
return flagObjectCopy();
#endif
}
else
@@ -5398,7 +5367,7 @@ BOOL LLViewerObject::permMove() const
return TRUE;
}
# endif
return ((mFlags & FLAGS_OBJECT_MOVE) != 0);
return flagObjectMove();
#endif
}
else
@@ -5422,7 +5391,7 @@ BOOL LLViewerObject::permTransfer() const
return TRUE;
}
# endif
return ((mFlags & FLAGS_OBJECT_TRANSFER) != 0);
return flagObjectTransfer();
#endif
}
else
@@ -5468,21 +5437,19 @@ void LLViewerObject::markForUpdate(BOOL priority)
}
}
bool LLViewerObject::isPermanentEnforced() const
{
return flagObjectPermanent() && (mRegionp != gAgent.getRegion()) && !gAgent.isGodlike();
}
bool LLViewerObject::getIncludeInSearch() const
{
return ((mFlags & FLAGS_INCLUDE_IN_SEARCH) != 0);
return flagIncludeInSearch();
}
void LLViewerObject::setIncludeInSearch(bool include_in_search)
{
if (include_in_search)
{
mFlags |= FLAGS_INCLUDE_IN_SEARCH;
}
else
{
mFlags &= ~FLAGS_INCLUDE_IN_SEARCH;
}
setFlags(FLAGS_INCLUDE_IN_SEARCH, include_in_search);
}
void LLViewerObject::setRegion(LLViewerRegion *regionp)
@@ -5507,8 +5474,8 @@ void LLViewerObject::setRegion(LLViewerRegion *regionp)
bool LLViewerObject::specialHoverCursor() const
{
return (mFlags & FLAGS_USE_PHYSICS)
|| (mFlags & FLAGS_HANDLE_TOUCH)
return flagUsePhysics()
|| flagHandleTouch()
|| (mClickAction != 0);
}
@@ -5521,10 +5488,15 @@ void LLViewerObject::updateFlags(BOOL physics_changed)
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, getLocalID() );
gMessageSystem->addBOOLFast(_PREHASH_UsePhysics, usePhysics() );
gMessageSystem->addBOOLFast(_PREHASH_UsePhysics, flagUsePhysics() );
gMessageSystem->addBOOL("IsTemporary", flagTemporaryOnRez() );
gMessageSystem->addBOOL("IsPhantom", flagPhantom() );
gMessageSystem->addBOOL("CastsShadows", flagCastShadows() );
// stinson 02/28/2012 : This CastsShadows BOOL is no longer used in either the viewer or the simulator
// The simulator code does not even unpack this value when the message is received.
// This could be potentially hijacked in the future for another use should the urgent need arise.
gMessageSystem->addBOOL("CastsShadows", FALSE );
if (physics_changed)
{
gMessageSystem->nextBlock("ExtraPhysics");
@@ -5538,6 +5510,19 @@ void LLViewerObject::updateFlags(BOOL physics_changed)
}
BOOL LLViewerObject::setFlags(U32 flags, BOOL state)
{
BOOL setit = setFlagsWithoutUpdate(flags, state);
// BUG: Sometimes viewer physics and simulator physics get
// out of sync. To fix this, always send update to simulator.
// if (setit)
{
updateFlags();
}
return setit;
}
BOOL LLViewerObject::setFlagsWithoutUpdate(U32 flags, BOOL state)
{
BOOL setit = FALSE;
if (state)
@@ -5556,13 +5541,6 @@ BOOL LLViewerObject::setFlags(U32 flags, BOOL state)
setit = TRUE;
}
}
// BUG: Sometimes viewer physics and simulator physics get
// out of sync. To fix this, always send update to simulator.
// if (setit)
{
updateFlags();
}
return setit;
}