diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 09:28:26 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-17 09:28:26 +0000 |
| commit | a402f4894d72209f9ac9bc9d7962c28b3c26bb18 (patch) | |
| tree | 1db4f4a35008b6f4281e6275b7a4beb679d285d6 /indra/newview/llviewermedia.h | |
| parent | b42b421d25f3b3a7ea4f571388acb64f98e1f51d (diff) | |
| parent | ccc72757ef23fa7ffba066e5bdaf05e3f8a95cca (diff) | |
merge.
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index a06079786e..f4afce6c4c 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -270,6 +270,7 @@ public: F64 getInterest() const { return mInterest; }; F64 getApproximateTextureInterest(); S32 getProximity() const { return mProximity; }; + F64 getProximityDistance() const { return mProximityDistance; }; // Mark this object as being used in a UI panel instead of on a prim // This will be used as part of the interest sorting algorithm. @@ -339,6 +340,7 @@ public: bool mIsDisabled; bool mIsParcelMedia; S32 mProximity; + F64 mProximityDistance; LLMimeDiscoveryResponder *mMimeTypeProbe; private: |