diff options
| author | David Seikel | 2011-03-03 00:47:05 +1000 |
|---|---|---|
| committer | David Seikel | 2011-03-03 00:47:05 +1000 |
| commit | f024c14f564b1eb88a2c880ef3086daeec3e3e4c (patch) | |
| tree | 3e94c586392e3b73add5fbdd97a1298836d8597f /linden/indra/newview/app_settings/settings.xml | |
| parent | There are other ways to tell if someone is age verified. Implimenting policy... (diff) | |
| parent | Renaming some images to match the "meta7" branding. (diff) | |
| download | meta-impy-f024c14f564b1eb88a2c880ef3086daeec3e3e4c.zip meta-impy-f024c14f564b1eb88a2c880ef3086daeec3e3e4c.tar.gz meta-impy-f024c14f564b1eb88a2c880ef3086daeec3e3e4c.tar.bz2 meta-impy-f024c14f564b1eb88a2c880ef3086daeec3e3e4c.tar.xz | |
Merge branch 'branding' into weekly
Diffstat (limited to 'linden/indra/newview/app_settings/settings.xml')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 5d52329..fb2e78c 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -11149,7 +11149,7 @@ | |||
| 11149 | <key>Type</key> | 11149 | <key>Type</key> |
| 11150 | <string>String</string> | 11150 | <string>String</string> |
| 11151 | <key>Value</key> | 11151 | <key>Value</key> |
| 11152 | <string>Meta7</string> | 11152 | <string>meta7</string> |
| 11153 | </map> | 11153 | </map> |
| 11154 | <key>SkyAmbientScale</key> | 11154 | <key>SkyAmbientScale</key> |
| 11155 | <map> | 11155 | <map> |