From 497d3f4bfc2b6b45574ef871c11c6fb8e6145d63 Mon Sep 17 00:00:00 2001 From: "Brad Payne (Vir Linden)" Date: Wed, 18 Sep 2013 17:04:34 -0400 Subject: sunshine cleanup annotations --- indra/newview/llagent.cpp | 1 + indra/newview/llvoavatar.cpp | 2 ++ indra/newview/llvoavatar.h | 1 + indra/newview/llvoavatarself.h | 1 + 4 files changed, 5 insertions(+) diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index c13082efdc..2bcd7d300e 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -811,6 +811,7 @@ void LLAgent::standUp() } +// SUNSHINE CLEANUP - are there any cases we still want to handle here? void LLAgent::handleServerBakeRegionTransition(const LLUUID& region_id) { llinfos << "called" << llendl; diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 8e293d0c06..1d25bc1e29 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -6896,6 +6896,7 @@ void LLVOAvatar::parseAppearanceMessage(LLMessageSystem* mesgsys, LLAppearanceMe } } +// SUNSHINE CLEANUP - OK to remove the version = 0 case, assume we're at least 1? bool resolve_appearance_version(const LLAppearanceMessageContents& contents, S32& appearance_version) { appearance_version = -1; @@ -6926,6 +6927,7 @@ bool resolve_appearance_version(const LLAppearanceMessageContents& contents, S32 return true; } +// SUNSHINE CLEANUP - if we can assume server baking, we can simplify some code here. //----------------------------------------------------------------------------- // processAvatarAppearance() //----------------------------------------------------------------------------- diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 13c0332d35..9722b77956 100755 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -649,6 +649,7 @@ public: // True if this avatar should fetch its baked textures via the new // appearance mechanism. + // SUNSHINE CLEANUP - always true, remove? BOOL isUsingServerBakes() const; void setIsUsingServerBakes(BOOL newval); diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 7eeaaf5fe5..b4981e9823 100755 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -196,6 +196,7 @@ public: // Loading status //-------------------------------------------------------------------- public: + // SUNSHINE CLEANUP /*virtual*/ bool hasPendingBakedUploads() const; S32 getLocalDiscardLevel(LLAvatarAppearanceDefines::ETextureIndex type, U32 index) const; bool areTexturesCurrent() const; -- cgit v1.2.3