summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-11-11 22:16:04 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-11-11 22:16:04 +0200
commit74c3b7a0ee70f639dc5dcfd08f7f0762758183ee (patch)
treedffe098f8ff7443eaa20a215c980a395252dc190 /indra/newview/llstartup.cpp
parent3f51c0423942f61d27c33bfdb1622e5ae2b8c9ae (diff)
parent04c473ab46041133ea6a87dbe0d43e662472adf5 (diff)
Merged master (DRTVWR-507) into DRTVWR-514-keymappings
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 3ef2d47d37..17777c3ceb 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1230,7 +1230,6 @@ bool idle_startup()
display_startup();
gAgentCamera.init();
display_startup();
- set_underclothes_menu_options();
display_startup();
// Since we connected, save off the settings so the user doesn't have to