summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateropenobject.h
diff options
context:
space:
mode:
authorBrad Linden <46733234+brad-linden@users.noreply.github.com>2024-05-06 15:44:19 -0700
committerGitHub <noreply@github.com>2024-05-06 15:44:19 -0700
commit84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch)
treeb91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/llfloateropenobject.h
parent76101843c0d390c25a783f212eb1ea75e508ada4 (diff)
parent8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff)
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
Diffstat (limited to 'indra/newview/llfloateropenobject.h')
-rw-r--r--indra/newview/llfloateropenobject.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h
index 745753316b..953fae21d2 100644
--- a/indra/newview/llfloateropenobject.h
+++ b/indra/newview/llfloateropenobject.h
@@ -55,7 +55,7 @@ public:
protected:
- /*virtual*/ BOOL postBuild();
+ /*virtual*/ bool postBuild();
void refresh();
void draw();
virtual void onOpen(const LLSD& key);
@@ -76,7 +76,7 @@ protected:
LLPanelObjectInventory* mPanelInventoryObject;
LLSafeHandle<LLObjectSelection> mObjectSelection;
- BOOL mDirty;
+ bool mDirty;
};
#endif