summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-12-07 11:47:51 -0800
committerRichard Linden <none@none>2011-12-07 11:47:51 -0800
commit422c3418145efcdac615d0f66163b50f23ef8b40 (patch)
tree3fc272642711edd951eac106243236924661453f /indra/llui/llfloater.h
parent1c71b9030062985c307704bdf42925e0c7cb97b6 (diff)
parentafc19140575fb96826b12139d77c5b2174c4713e (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/llfloater.h')
-rw-r--r--indra/llui/llfloater.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index c70eb0958d..59b35d206f 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -156,6 +156,8 @@ public:
Optional<CommitCallbackParam> open_callback,
close_callback;
+
+ Ignored follows;
Params();
};