diff options
author | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
commit | 98e46e28e05c22c02da41603a056c0caf34f5ad0 (patch) | |
tree | a24352a4ce377d91428554aab15f96f887b24514 /indra/newview/llpanelprimmediacontrols.cpp | |
parent | 9e1b600d9b41afea62b2ba68fa8d5bc5861d1111 (diff) | |
parent | 2c5c563319d5ba8eaeae93b627536321956d347e (diff) |
Merge with tip
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
-rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index a9ec01f33a..ab2f9284f7 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -32,6 +32,7 @@ #include "llviewerprecompiledheaders.h" //LLPanelPrimMediaControls +#include "llagent.h" #include "llagentcamera.h" #include "llparcel.h" #include "llpanel.h" |