aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-20 15:28:05 -0700
committerMcCabe Maxsted2009-09-20 15:28:05 -0700
commit3aac8b90e1665509fe56cf6e42602c81a44aefdd (patch)
tree498ef50f366e2ceb60a56fbcb9c54abb9a2efa1d
parentFixed group titles showing up as ? (diff)
downloadmeta-impy-3aac8b90e1665509fe56cf6e42602c81a44aefdd.zip
meta-impy-3aac8b90e1665509fe56cf6e42602c81a44aefdd.tar.gz
meta-impy-3aac8b90e1665509fe56cf6e42602c81a44aefdd.tar.bz2
meta-impy-3aac8b90e1665509fe56cf6e42602c81a44aefdd.tar.xz
Added adult compliant flag
-rw-r--r--ChangeLog.txt5
-rw-r--r--linden/indra/newview/llstartup.cpp1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7ccbbdf..bec47c6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -19,6 +19,11 @@
19 * Fixed group titles showing up as ?. 19 * Fixed group titles showing up as ?.
20 20
21 modified: linden/indra/newview/llvoavatar.cpp 21 modified: linden/indra/newview/llvoavatar.cpp
22
23
24 * Added adult compliant flag.
25
26 modified: linden/indra/newview/llstartup.cpp
22 27
23 28
242009-09-18 McCabe Maxsted <hakushakukun@gmail.com> 292009-09-18 McCabe Maxsted <hakushakukun@gmail.com>
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 8d5aa9e..ea08298 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1025,6 +1025,7 @@ bool idle_startup()
1025 requested_options.push_back("event_categories"); 1025 requested_options.push_back("event_categories");
1026 requested_options.push_back("event_notifications"); 1026 requested_options.push_back("event_notifications");
1027 requested_options.push_back("classified_categories"); 1027 requested_options.push_back("classified_categories");
1028 requested_options.push_back("adult_compliant");
1028 //requested_options.push_back("inventory-targets"); 1029 //requested_options.push_back("inventory-targets");
1029 requested_options.push_back("buddy-list"); 1030 requested_options.push_back("buddy-list");
1030 requested_options.push_back("ui-config"); 1031 requested_options.push_back("ui-config");