summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloatereditenvironmentbase.h2
-rw-r--r--indra/newview/llfloatereditextdaycycle.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloatereditenvironmentbase.h b/indra/newview/llfloatereditenvironmentbase.h
index 7c7cf5bdcd..d900d7f003 100644
--- a/indra/newview/llfloatereditenvironmentbase.h
+++ b/indra/newview/llfloatereditenvironmentbase.h
@@ -107,7 +107,7 @@ protected:
void onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settins, S32 status);
-private:
+protected:
LLUUID mExpectingAssetId; // for asset load confirmation
};
diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h
index 9a30fb199f..ab5d12fa36 100644
--- a/indra/newview/llfloatereditextdaycycle.h
+++ b/indra/newview/llfloatereditextdaycycle.h
@@ -194,8 +194,6 @@ private:
std::string mLastFrameSlider;
bool mShiftCopyEnabled;
- LLUUID mExpectingAssetId;
-
LLButton* mAddFrameButton;
LLButton* mDeleteFrameButton;
LLButton* mImportButton;