diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-03-08 09:17:14 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-03-08 09:17:14 -0800 |
| commit | 0d32b5bf20990a6afa1697469c1f301b902258ad (patch) | |
| tree | 2fc9fb4eb7a94df739e40bf1c1c886ec11fe59c1 /indra/newview/llpanelenvironment.h | |
| parent | 53f3755a4629206754a5695de233d88062a54d3d (diff) | |
| parent | a237325ad64d0930340e2a6f82d4042797ed8e68 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelenvironment.h')
| -rw-r--r-- | indra/newview/llpanelenvironment.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llpanelenvironment.h b/indra/newview/llpanelenvironment.h index 87ce0772b2..9eb4040758 100644 --- a/indra/newview/llpanelenvironment.h +++ b/indra/newview/llpanelenvironment.h @@ -85,7 +85,6 @@ protected: static const std::string STR_LABEL_USEDEFAULT; static const std::string STR_LABEL_USEREGION; - static const std::string STR_LABEL_UNKNOWNINV; static const std::string STR_ALTITUDE_DESCRIPTION; static const std::string STR_NO_PARCEL; static const std::string STR_CROSS_REGION; @@ -135,8 +134,6 @@ protected: virtual bool isLargeEnough() = 0; virtual void refreshFromSource() = 0; - std::string getInventoryNameForAssetId(LLUUID asset_id); - std::string getNameForTrackIndex(S32 index); LLFloaterSettingsPicker * getSettingsPicker(bool create = true); |