diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-16 18:19:43 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-16 18:19:43 -0800 |
| commit | d3b03c7f53388a4a43cbce7c5ab196ab469d4abd (patch) | |
| tree | 1199b9a925e21a2a8d82dcb2cf4ee91927d82f0b /indra/newview/llviewermedia.h | |
| parent | 6e7d131e5800d921ec9bcf7b51f619256367fa55 (diff) | |
| parent | 27a555e443c98ce1a41ef21e6111bdfe903894e8 (diff) | |
Merge with viewer-2-0 changes
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: |