diff options
| author | Richard Linden <none@none> | 2012-02-28 13:46:51 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-28 13:46:51 -0800 |
| commit | 26af98b4435609d844f9fefa9ebb7db0a9bd8e0a (patch) | |
| tree | f98fa17179b57afd59f8acdf4d635806b999b256 /indra/llui/llfloater.h | |
| parent | 229c00ab2a6e1708db10e893b8c2241a0b3e178a (diff) | |
| parent | 80f2548371328f6fa1936ecc03a85a09f1b19508 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/llfloater.h')
| -rw-r--r-- | indra/llui/llfloater.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 4aa663d57e..64d6dcea04 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -358,7 +358,7 @@ protected: virtual bool applyRectControl(); bool applyDockState(); - void applyPositioning(LLFloater* other); + void applyPositioning(LLFloater* other, bool on_open); void applyRelativePosition(); void storeRectControl(); |