diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:27:46 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 12:27:46 +0300 |
| commit | e59216443619dd2280ce0fff316a2b9e2ee7cf5e (patch) | |
| tree | 27d782916858596d67a60ecf56ca07b6a44a4601 /indra/llui/llfolderview.h | |
| parent | dcb85f9f9d1019bb046a5719bc3645fa96a2d060 (diff) | |
| parent | bb3c36f5cbc0c3b542045fd27255eee24e03da22 (diff) | |
Merge branch 'main' into release/maint-c
# Conflicts:
# indra/llui/lltexteditor.cpp
# indra/newview/llcontrolavatar.cpp
Diffstat (limited to 'indra/llui/llfolderview.h')
| -rw-r--r-- | indra/llui/llfolderview.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h index 1ad7e9f58c..ca78bd3072 100644 --- a/indra/llui/llfolderview.h +++ b/indra/llui/llfolderview.h @@ -345,6 +345,8 @@ protected: LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* mCallbackRegistrar; LLUICtrl::EnableCallbackRegistry::ScopedRegistrar* mEnableRegistrar; + boost::signals2::connection mRenamerTopLostSignalConnection; + bool mForceArrange; public: |