From c67db8e75511de879c69de0faf06a88ac3cc731d Mon Sep 17 00:00:00 2001 From: Nyx Linden Date: Mon, 17 Jun 2013 18:52:03 -0400 Subject: SH-4274 FIX Adding RegionHandshakeReply flags for SSA Adding a flag to hint to the sim that this viewer knows how to handle AvatarAppearance messages for self in SSA-enabled regions. --- indra/newview/llviewerregion.cpp | 6 +++++- indra/newview/llviewerregion.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index b8b53aa6e4..48c050f403 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1568,7 +1568,11 @@ void LLViewerRegion::unpackRegionHandshake() msg->addUUID("AgentID", gAgent.getID()); msg->addUUID("SessionID", gAgent.getSessionID()); msg->nextBlock("RegionInfo"); - msg->addU32("Flags", 0x0 ); + + U32 flags = 0; + flags |= REGION_HANDSHAKE_SUPPORTS_SELF_APPEARANCE; + + msg->addU32("Flags", flags ); msg->sendReliable(host); } diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index b5fe4677b7..5ac2a83aaf 100755 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -49,6 +49,8 @@ #define WATER 2 const U32 MAX_OBJECT_CACHE_ENTRIES = 50000; +// Region handshake flags +const U32 REGION_HANDSHAKE_SUPPORTS_SELF_APPEARANCE = 1U << 2; class LLEventPoll; class LLVLComposition; -- cgit v1.2.3