summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-16 21:22:45 -0400
committerOz Linden <oz@lindenlab.com>2011-03-16 21:22:45 -0400
commit31edad0a226a14b5b87fe364c629f8450bda567c (patch)
treee03ed820a759cd5d5c5f4f930762f73b0fe4cf24 /indra/llui/llfloater.h
parentb6e6ba224620e0b122062c88f40295c10ce8db2d (diff)
parent742dd75751f65224d80eb4f7d20daf5a21776c5f (diff)
merge changes for storm-357
Diffstat (limited to 'indra/llui/llfloater.h')
-rw-r--r--indra/llui/llfloater.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index bb96272d02..0e83b80c89 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -495,10 +495,10 @@ public:
// value is not defined.
S32 getZOrder(LLFloater* child);
- void setSnapOffsetBottom(S32 offset) { mSnapOffsetBottom = offset; }
- void setSnapOffsetRight(S32 offset) { mSnapOffsetRight = offset; }
+ void setFloaterSnapView(LLHandle<LLView> snap_view) {mSnapView = snap_view; }
private:
+ LLHandle<LLView> mSnapView;
BOOL mFocusCycleMode;
S32 mSnapOffsetBottom;
S32 mSnapOffsetRight;