diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-23 07:10:26 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-23 07:10:26 +0300 |
| commit | 638fe8757694b4039e8b88d83fb8b7b7cfafb1a4 (patch) | |
| tree | 2c4fb2a4d4db5022c395bafde44e01666d08a868 /indra/newview/llstartup.h | |
| parent | 7587f0dd88526e61a4741ad8e2d9894027de1ffb (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' into DRTVWR-483
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelpicks.h
# indra/newview/llviewerfloaterreg.cpp
Diffstat (limited to 'indra/newview/llstartup.h')
| -rw-r--r-- | indra/newview/llstartup.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h index 3ec3ff4133..116aeb36a7 100644 --- a/indra/newview/llstartup.h +++ b/indra/newview/llstartup.h @@ -110,9 +110,6 @@ public: static void loadInitialOutfit( const std::string& outfit_folder_name, const std::string& gender_name ); - //save loaded initial outfit into My Outfits category - static void saveInitialOutfit(); - static std::string& getInitialOutfitName(); static std::string getUserId(); |