summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorsimon_linden <none@none>2013-08-27 15:00:59 -0700
committersimon_linden <none@none>2013-08-27 15:00:59 -0700
commit892d439b5502d7fad069ec35e5c6825e7d6609fe (patch)
treed2770b6a2e7bc08cee9dd05953ed9f965808e1d2 /indra/newview
parent90d1c5b3676fe4e8ea8668b41fdf92613d5f102d (diff)
parentdc54af030e8f60b2b871be901664ffae1fc934e9 (diff)
Merge downstream code
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/app_settings/keywords.ini2
-rw-r--r--indra/newview/llavatarrenderinfoaccountant.cpp31
-rwxr-xr-xindra/newview/llvoavatar.cpp2
-rwxr-xr-xindra/newview/llvoavatar.h6
4 files changed, 5 insertions, 36 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index ef3c319da6..5ff8408943 100755
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -195,8 +195,6 @@ OBJECT_PHYSICS Used with llGetObjectDetails to determine if the object is phy
OBJECT_PHANTOM Used with llGetObjectDetails to determine if the object is phantom or not
OBJECT_TEMP_ON_REZ Used with llGetObjectDetails to determine if the object is temporary or not
OBJECT_RENDER_WEIGHT Used with llGetObjectDetails to return an avatar's rendering weight
-OBJECT_ATTACHMENT_GEOMETRY_BYTES Used with llGetObjectDetails to return an avatar's attachment rendering geometry bytes
-OBJECT_ATTACHMENT_SURFACE_AREA Used with llGetObjectDetails to return an avatar's attachment surface area
# some vehicle params
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp
index 2a4ec6d320..89c1b2a186 100644
--- a/indra/newview/llavatarrenderinfoaccountant.cpp
+++ b/indra/newview/llavatarrenderinfoaccountant.cpp
@@ -46,8 +46,6 @@
static const std::string KEY_AGENTS = "agents"; // map
static const std::string KEY_WEIGHT = "weight"; // integer
-static const std::string KEY_GEOMETRY = "geometry"; // integer
-static const std::string KEY_SURFACE = "surface"; // float
static const std::string KEY_IDENTIFIER = "identifier";
static const std::string KEY_MESSAGE = "message";
@@ -125,14 +123,6 @@ public:
{
((LLVOAvatar *) avatarp)->setReportedVisualComplexity(agent_info_map[KEY_WEIGHT].asInteger());
}
- if (agent_info_map.has(KEY_GEOMETRY))
- {
- ((LLVOAvatar *) avatarp)->setReportedAttachmentGeometryBytes(agent_info_map[KEY_GEOMETRY].asInteger());
- }
- if (agent_info_map.has(KEY_SURFACE))
- {
- ((LLVOAvatar *) avatarp)->setReportedAttachmentSurfaceArea((F32) agent_info_map[KEY_SURFACE].asReal());
- }
}
report_iter++;
}
@@ -259,24 +249,13 @@ void LLAvatarRenderInfoAccountant::sendRenderInfoToRegion(LLViewerRegion * regio
if (avatar->getVisualComplexity() > 0)
{
info[KEY_WEIGHT] = avatar->getVisualComplexity();
- }
- if (avatar->getAttachmentGeometryBytes() >= 0)
- {
- info[KEY_GEOMETRY] = (S32) avatar->getAttachmentGeometryBytes();
- }
- if (avatar->getAttachmentSurfaceArea() >= 0.f)
- {
- info[KEY_SURFACE] = avatar->getAttachmentSurfaceArea();
- }
- if (info.size() > 0)
- {
agents[avatar->getID().asString()] = info;
- }
- if (logRenderInfo())
- {
- llinfos << "Sending avatar render info for " << avatar->getID()
- << ": " << info << llendl;
+ if (logRenderInfo())
+ {
+ llinfos << "Sending avatar render info for " << avatar->getID()
+ << ": " << info << llendl;
+ }
}
}
iter++;
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 0ffd8ad119..6a504e10c4 100755
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -670,8 +670,6 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
mAttachmentGeometryBytes(-1),
mAttachmentSurfaceArea(-1.f),
mReportedVisualComplexity(-1),
- mReportedAttachmentGeometryBytes(-1),
- mReportedAttachmentSurfaceArea(-1.f),
mTurning(FALSE),
mLastSkeletonSerialNum( 0 ),
mIsSitting(FALSE),
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index be2d69a41a..295175133c 100755
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -259,10 +259,6 @@ public:
S32 getReportedVisualComplexity() { return mReportedVisualComplexity; }; // Numbers as reported by the SL server
void setReportedVisualComplexity(S32 value) { mReportedVisualComplexity = value; };
- S32 getReportedAttachmentGeometryBytes() { return mReportedAttachmentGeometryBytes; }; //number of bytes in attached geometry
- void setReportedAttachmentGeometryBytes(S32 value) { mReportedAttachmentGeometryBytes = value; };
- F32 getReportedAttachmentSurfaceArea() { return mReportedAttachmentSurfaceArea; }; //estimated surface area of attachments
- void setReportedAttachmentSurfaceArea(F32 value) { mReportedAttachmentSurfaceArea = value; };
S32 getUpdatePeriod() { return mUpdatePeriod; };
const LLColor4 & getMutedAVColor() { return mMutedAVColor; };
@@ -416,8 +412,6 @@ public:
F32 mAttachmentSurfaceArea; //estimated surface area of attachments
S32 mReportedVisualComplexity; // Numbers as reported by the SL server
- S32 mReportedAttachmentGeometryBytes; //number of bytes in attached geometry
- F32 mReportedAttachmentSurfaceArea; //estimated surface area of attachments
private:
bool shouldAlphaMask();