summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingspermissions.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2009-12-14 14:10:16 -0800
committercallum <none@none>2009-12-14 14:10:16 -0800
commit180daf3ab83ff9a83200c1952c0f09d20cfcb992 (patch)
tree4591d743023244614678022269d80ef6d8097f63 /indra/newview/llpanelmediasettingspermissions.cpp
parent894a5006b3e5b4c725060443dab34491b0da3a4d (diff)
parent5b6e4577ae6073650d78e1181ca5b60c527a7ae7 (diff)
Merge with Tip
Diffstat (limited to 'indra/newview/llpanelmediasettingspermissions.cpp')
-rw-r--r--indra/newview/llpanelmediasettingspermissions.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmediasettingspermissions.cpp b/indra/newview/llpanelmediasettingspermissions.cpp
index 1fadb41c18..a3c0e872d2 100644
--- a/indra/newview/llpanelmediasettingspermissions.cpp
+++ b/indra/newview/llpanelmediasettingspermissions.cpp
@@ -264,4 +264,4 @@ void LLPanelMediaSettingsPermissions::getValues( LLSD &fill_me_in )
void LLPanelMediaSettingsPermissions::postApply()
{
// no-op
-} \ No newline at end of file
+}