diff options
| author | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2025-03-25 09:58:43 -0700 |
| commit | b86c36eafcdb0fb42c1b68ef671050dea67dc6c3 (patch) | |
| tree | dfa54e83a9ccac2c5346210c05626e61760e2822 /indra/newview/llpanelcontents.h | |
| parent | 48ccb0f75b078670ced1f8fe8d4942abe0a6f293 (diff) | |
| parent | 423df2ba4b731417796478c449e3e8f3d166ef21 (diff) | |
Merge remote-tracking branch 'remotes/origin/develop' into rider/bot_tattle
Fix conflicts
Diffstat (limited to 'indra/newview/llpanelcontents.h')
| -rw-r--r-- | indra/newview/llpanelcontents.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h index bb6308e8b8..6e02b17bab 100644 --- a/indra/newview/llpanelcontents.h +++ b/indra/newview/llpanelcontents.h @@ -70,6 +70,8 @@ protected: void getState(LLViewerObject *object); void onFilterEdit(); + bool mDirtyFilter { false }; + public: class LLFilterEditor* mFilterEditor; LLSaveFolderState mSavedFolderState; |