diff options
| author | Jacek Antonelli | 2009-09-23 02:52:02 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-23 02:52:02 -0500 |
| commit | 43e98d9922d2d163fb5f44f63e33fa207b53d3c2 (patch) | |
| tree | e5da68070e495a4554450159682a8532fd0b61a2 /linden/indra/newview/llstartup.cpp | |
| parent | Updated Grid Manager from Meerkat's SVN (as of r215). (diff) | |
| parent | Moved "Show HUD Attachments" back to View, restored shortcut. (diff) | |
| download | meta-impy-43e98d9922d2d163fb5f44f63e33fa207b53d3c2.zip meta-impy-43e98d9922d2d163fb5f44f63e33fa207b53d3c2.tar.gz meta-impy-43e98d9922d2d163fb5f44f63e33fa207b53d3c2.tar.bz2 meta-impy-43e98d9922d2d163fb5f44f63e33fa207b53d3c2.tar.xz | |
Merge branch 'next' into login-manager
Conflicts:
linden/indra/newview/llinventorymodel.cpp
linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
| -rw-r--r-- | linden/indra/newview/llstartup.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index cdcd539..d6dff01 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
| @@ -1058,6 +1058,7 @@ bool idle_startup() | |||
| 1058 | requested_options.push_back("event_categories"); | 1058 | requested_options.push_back("event_categories"); |
| 1059 | requested_options.push_back("event_notifications"); | 1059 | requested_options.push_back("event_notifications"); |
| 1060 | requested_options.push_back("classified_categories"); | 1060 | requested_options.push_back("classified_categories"); |
| 1061 | requested_options.push_back("adult_compliant"); | ||
| 1061 | //requested_options.push_back("inventory-targets"); | 1062 | //requested_options.push_back("inventory-targets"); |
| 1062 | requested_options.push_back("buddy-list"); | 1063 | requested_options.push_back("buddy-list"); |
| 1063 | requested_options.push_back("ui-config"); | 1064 | requested_options.push_back("ui-config"); |