diff options
author | Callum Prentice <callum@mbp.local> | 2021-06-24 14:37:20 -0700 |
---|---|---|
committer | Callum Prentice <callum@mbp.local> | 2021-06-24 14:37:20 -0700 |
commit | 7ff743a13856d1e883baaa8294480d9973bfedfb (patch) | |
tree | 40ccb88bd6c7208ab4c4dbe34b192270f665d931 /indra/llui/llfloater.h | |
parent | 38765be8b0fd6ca36ce8f1fe35c962d2eaf0f3d8 (diff) | |
parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) |
Merge branch 'master' into DRTVWR-531
Diffstat (limited to 'indra/llui/llfloater.h')
-rw-r--r-- | indra/llui/llfloater.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index f8c04e8a2f..2672d600c6 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -172,6 +172,9 @@ public: Optional<S32> header_height, legacy_header_height; // HACK see initFromXML() + Optional<F32> rel_x, + rel_y; + // Images for top-right controls Optional<LLUIImage*> close_image, restore_image, @@ -521,6 +524,9 @@ private: BOOL mHasBeenDraggedWhileMinimized; S32 mPreviousMinimizedBottom; S32 mPreviousMinimizedLeft; + + F32 mDefaultRelativeX; + F32 mDefaultRelativeY; }; |