summaryrefslogtreecommitdiff
path: root/indra/llui/llresizebar.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-08-05 16:10:15 -0400
committerNat Goodspeed <nat@lindenlab.com>2009-08-05 16:10:15 -0400
commit07129bf928f79246849e66b396fab44a7a228216 (patch)
treee4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/llui/llresizebar.h
parent03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff)
parentdc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff)
Merge recent changes
Diffstat (limited to 'indra/llui/llresizebar.h')
-rw-r--r--indra/llui/llresizebar.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llresizebar.h b/indra/llui/llresizebar.h
index 4ad3d5035a..a7bc3c60f5 100644
--- a/indra/llui/llresizebar.h
+++ b/indra/llui/llresizebar.h
@@ -52,11 +52,11 @@ public:
Optional<bool> allow_double_click_snapping;
Params()
- : max_size("", S32_MAX),
- snapping_enabled("", true),
+ : max_size("max_size", S32_MAX),
+ snapping_enabled("snapping_enabled", true),
resizing_view("resizing_view"),
side("side"),
- allow_double_click_snapping("", true)
+ allow_double_click_snapping("allow_double_click_snapping", true)
{
name = "resize_bar";
}