summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-15 14:49:55 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-15 14:49:55 +0100
commit66caff142addc206a98c9d6d51648dc6b0070832 (patch)
tree8f86c7d57a5857484c22ed4221610c634a1895d0 /indra/newview
parent90250cb36d1bf42daa4af3629ffbe3c54cb28390 (diff)
parentea412a737707ca480955c7ad4f54322a61f1bb3d (diff)
merge backout.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatersnapshot.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h
index d876fc4781..f212352cfc 100644
--- a/indra/newview/llfloatersnapshot.h
+++ b/indra/newview/llfloatersnapshot.h
@@ -46,12 +46,12 @@ public:
SNAPSHOT_FORMAT_JPEG,
SNAPSHOT_FORMAT_BMP
} ESnapshotFormat;
-
- enum ESnapshotMode
- {
- SNAPSHOT_SHARE,
- SNAPSHOT_SAVE,
- SNAPSHOT_MAIN
+
+ enum ESnapshotMode
+ {
+ SNAPSHOT_SHARE,
+ SNAPSHOT_SAVE,
+ SNAPSHOT_MAIN
};
LLFloaterSnapshot(const LLSD& key);