summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobjectlist.h
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2013-09-30 17:27:25 -0700
committerBaker Linden <baker@lindenlab.com>2013-09-30 17:27:25 -0700
commitce526d40638fcc78724913621ee5c12f792f1859 (patch)
tree735e03596926582d70d1609754d4e91fd6f49b77 /indra/newview/llviewerobjectlist.h
parent34f561db55868185f0a946009f41f4f212366484 (diff)
parentad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff)
Merge with voorhees (viewer-release)
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rwxr-xr-xindra/newview/llviewerobjectlist.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 449a4633ff..6518c25d09 100755
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -188,7 +188,6 @@ public:
S32 mNumUnknownUpdates;
S32 mNumDeadObjectUpdates;
- S32 mNumUnknownKills;
S32 mNumDeadObjects;
protected:
std::vector<U64> mOrphanParents; // LocalID/ip,port of orphaned objects