Fixed merge conflicts

1 files changed, 2 insertions, 0 deletions

diff --git a/linden/indra/llmedia/llmediaimplcommon.h b/linden/indra/llmedia/llmediaimplcommon.h
index aa6c4d5..8a726f1 100644
--- a/linden/indra/llmedia/llmediaimplcommon.h
+++ b/linden/indra/llmedia/llmediaimplcommon.h
@@ -54,6 +54,7 @@ class LLMediaImplCommon :
                 // housekeeping
                 virtual bool init();
                 virtual bool reset();
+                virtual bool setDebugLevel( LLMediaBase::EDebugLevel level );
                 virtual bool setMimeType( const std::string url );
                 virtual std::string getMimeType() const;
                 virtual std::string getMediaURL() const;
@@ -156,6 +157,7 @@ class LLMediaImplCommon :
                 LLMediaBase::ECommand mCommand;
                 LLMediaBase::EStatus mStatus;
                 bool mLooping;
+                LLMediaBase::EDebugLevel mDebugLevel;
 };
 
 #endif  // LLMEDIAIMPLCOMMON_H