diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-05-22 13:08:35 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-05-22 13:08:35 -0700 |
| commit | 656967b326c59a3966261cd75e256e3a7a27cc0a (patch) | |
| tree | 1c2c4c8f2adae7f17930843913a286fc1fd784b4 /indra/newview/llfloaterfixedenvironment.h | |
| parent | 044b80e4e1a7b55f46e6f3b52c9cae6d9c6df3eb (diff) | |
| parent | b6ba9dd565b59e516571445e56f9dafe3bdf4061 (diff) | |
Merge PR
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.h')
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.h b/indra/newview/llfloaterfixedenvironment.h index 6f1030e6ed..ef47941555 100644 --- a/indra/newview/llfloaterfixedenvironment.h +++ b/indra/newview/llfloaterfixedenvironment.h @@ -80,7 +80,7 @@ protected: bool canApplyRegion() const; bool canApplyParcel() const; - LLFlyoutComboBtn * mFlyoutControl; + LLFlyoutComboBtnCtrl * mFlyoutControl; LLUUID mInventoryId; LLInventoryItem * mInventoryItem; |