diff options
| author | McCabe Maxsted | 2010-08-01 23:19:54 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-01 23:19:54 -0700 |
| commit | 637970ae2012bca278ecedc297b9732a055e9b28 (patch) | |
| tree | 95c9c688f91de6c4e00e2f8c03c0a65c20077225 /linden/indra | |
| parent | Added missing files from skins\default\xui\en-us to cmake (diff) | |
| download | meta-impy-637970ae2012bca278ecedc297b9732a055e9b28.zip meta-impy-637970ae2012bca278ecedc297b9732a055e9b28.tar.gz meta-impy-637970ae2012bca278ecedc297b9732a055e9b28.tar.bz2 meta-impy-637970ae2012bca278ecedc297b9732a055e9b28.tar.xz | |
Removed unused ZHAO entries from the AO template and added it to cmake
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | linden/indra/newview/app_settings/ao_template.ini | 30 |
2 files changed, 13 insertions, 18 deletions
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index d321b04..934eac0 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
| @@ -1322,6 +1322,7 @@ list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES}) | |||
| 1322 | 1322 | ||
| 1323 | set(viewer_APPSETTINGS_FILES | 1323 | set(viewer_APPSETTINGS_FILES |
| 1324 | app_settings/anim.ini | 1324 | app_settings/anim.ini |
| 1325 | app_settings/ao_template.ini | ||
| 1325 | app_settings/cmd_line.xml | 1326 | app_settings/cmd_line.xml |
| 1326 | app_settings/grass.xml | 1327 | app_settings/grass.xml |
| 1327 | app_settings/high_graphics.xml | 1328 | app_settings/high_graphics.xml |
diff --git a/linden/indra/newview/app_settings/ao_template.ini b/linden/indra/newview/app_settings/ao_template.ini index d35b2ee..33b530a 100644 --- a/linden/indra/newview/app_settings/ao_template.ini +++ b/linden/indra/newview/app_settings/ao_template.ini | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | ############################################################ | 1 | ############################################### |
| 2 | ############################################################ | 2 | ############################################### |
| 3 | ## | 3 | ## |
| 4 | ## IMPRUDENCE AO TEMPLATE | 4 | ## IMPRUDENCE AO TEMPLATE |
| 5 | ## | 5 | ## |
| 6 | ############################################################ | 6 | ############################################### |
| 7 | ## | 7 | ## |
| 8 | ## INSTRUCTIONS: | 8 | ## INSTRUCTIONS: |
| 9 | ## | 9 | ## |
| @@ -33,15 +33,15 @@ | |||
| 33 | ## | 33 | ## |
| 34 | ## 8. Press the "Reload" button in the AO. | 34 | ## 8. Press the "Reload" button in the AO. |
| 35 | ## | 35 | ## |
| 36 | ############################################################ | 36 | ############################################### |
| 37 | 37 | ||
| 38 | ############################################################ | 38 | ############################################### |
| 39 | ############################################################ | 39 | ############################################### |
| 40 | ## | 40 | ## |
| 41 | ## LIST YOUR ANIMATIONS HERE | 41 | ## LIST YOUR ANIMATIONS HERE |
| 42 | ## | 42 | ## |
| 43 | ############################################################ | 43 | ############################################### |
| 44 | ############################################################ | 44 | ############################################### |
| 45 | 45 | ||
| 46 | 46 | ||
| 47 | [ Standing ] | 47 | [ Standing ] |
| @@ -61,20 +61,14 @@ | |||
| 61 | [ Jumping ] | 61 | [ Jumping ] |
| 62 | [ Pre Jumping ] | 62 | [ Pre Jumping ] |
| 63 | [ Running ] | 63 | [ Running ] |
| 64 | [ Turning Right ] | ||
| 65 | [ Turning Left ] | ||
| 66 | [ Floating ] | ||
| 67 | [ Swimming Forward ] | ||
| 68 | [ Swimming Up ] | ||
| 69 | [ Swimming Down ] | ||
| 70 | 64 | ||
| 71 | 65 | ||
| 72 | ############################################################# | 66 | ############################################### |
| 73 | ############################################################# | 67 | ############################################### |
| 74 | ## | 68 | ## |
| 75 | ## FOR ADVANCED USERS ONLY | 69 | ## FOR ADVANCED USERS ONLY |
| 76 | ## | 70 | ## |
| 77 | ############################################################# | 71 | ############################################### |
| 78 | ## | 72 | ## |
| 79 | ## Lines starting with a # are treated as comments and ignored. Blank lines are ignored. Valid lines look like this: | 73 | ## Lines starting with a # are treated as comments and ignored. Blank lines are ignored. Valid lines look like this: |
| 80 | ## | 74 | ## |
| @@ -100,4 +94,4 @@ | |||
| 100 | ## | 94 | ## |
| 101 | ## Imprudence's AO notecard system is based on the ZHAO-II HUD by Second Life resident Ziggy Puff. | 95 | ## Imprudence's AO notecard system is based on the ZHAO-II HUD by Second Life resident Ziggy Puff. |
| 102 | ## | 96 | ## |
| 103 | ############################################################ \ No newline at end of file | 97 | ############################################### \ No newline at end of file |