diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-20 10:37:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-20 10:37:10 -0400 |
| commit | c42a91421ff4691e6d2efa5744fe3f246510649c (patch) | |
| tree | 0ce60a84e78b802c7f936e3b4cb1503edb2fa945 /indra/newview/llviewerobjectlist.h | |
| parent | d2b947c1fa0757e94eb74429a339a8198531dd93 (diff) | |
| parent | 171089207b528ab80a954292c127ba77254ee927 (diff) | |
merge changes for 3.6.3-release
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
| -rwxr-xr-x | indra/newview/llviewerobjectlist.h | 1 |
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 |