summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-01-08 12:26:09 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-01-08 12:26:09 -0800
commit0a3781673f7e95110d33df0332a4abe238f4c769 (patch)
tree4d283b8cf8b0935258a26fd5be5a35a5c5f55a64
parentd33b72c318a7676ae7212975965befc728c92c8c (diff)
Minor cleanup: make data members in LLViewerMediaImpl private.
This required adding one accessor and making two related classes friends of LLViewerMediaImpl.
-rw-r--r--indra/newview/llviewermedia.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index ad08846f7e..b103c48bd8 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -123,7 +123,10 @@ class LLViewerMediaImpl
{
LOG_CLASS(LLViewerMediaImpl);
public:
-
+
+ friend class LLViewerMedia;
+ friend class LLMimeDiscoveryResponder;
+
LLViewerMediaImpl(
const LLUUID& texture_id,
S32 media_width,
@@ -207,7 +210,10 @@ public:
void setDisabled(bool disabled);
bool isMediaDisabled() const { return mIsDisabled; };
-
+
+ void setInNearbyMediaList(bool in_list) { mInNearbyMediaList = in_list; }
+ bool getInNearbyMediaList() { return mInNearbyMediaList; }
+
// returns true if this instance should not be loaded (disabled, muted object, crashed, etc.)
bool isForcedUnloaded() const;
@@ -312,8 +318,7 @@ public:
void setNavState(EMediaNavState state);
void cancelMimeTypeProbe();
-
-public:
+private:
// a single media url with some data and an impl.
LLPluginClassMedia* mMediaSource;
LLUUID mTextureId;