diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-17 16:36:22 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-17 16:36:22 +0200 |
| commit | 402e957c56113550e53a3892908c6c7a5c16783a (patch) | |
| tree | 33cf9a73825392b2ed08d1de91c6bd4c0a28d83b /indra/newview/llviewermedia.h | |
| parent | 53be27e742b642c1642c3289e3e11b300a14d360 (diff) | |
| parent | 2217a677104ffadab8815a0886d66ac264e74792 (diff) | |
Merge from default branch.
Added missing trailing newline to fix Linux build.
--HG--
branch : product-engine
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: |