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/default_grids.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/default_grids.xml')
| -rw-r--r-- | linden/indra/newview/app_settings/default_grids.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml index b027476..d3068b1 100644 --- a/linden/indra/newview/app_settings/default_grids.xml +++ b/linden/indra/newview/app_settings/default_grids.xml | |||
| @@ -189,9 +189,9 @@ | |||
| 189 | <key>version</key> <string>1</string> | 189 | <key>version</key> <string>1</string> |
| 190 | </map> | 190 | </map> |
| 191 | 191 | ||
| 192 | <!-- Meta7 --> | 192 | <!-- meta 7 --> |
| 193 | <map> | 193 | <map> |
| 194 | <key>gridname</key> <string>Meta7</string> | 194 | <key>gridname</key> <string>meta 7</string> |
| 195 | <key>gridnick</key> <string>meta7</string> | 195 | <key>gridnick</key> <string>meta7</string> |
| 196 | <key>platform</key> <string>OpenSim</string> | 196 | <key>platform</key> <string>OpenSim</string> |
| 197 | <key>loginuri</key> <string>https://login.meta7.com/</string> | 197 | <key>loginuri</key> <string>https://login.meta7.com/</string> |
| @@ -205,7 +205,7 @@ | |||
| 205 | <key>version</key> <string>0</string> | 205 | <key>version</key> <string>0</string> |
| 206 | </map> | 206 | </map> |
| 207 | <map> | 207 | <map> |
| 208 | <key>gridname</key> <string>Meta7 beta</string> | 208 | <key>gridname</key> <string>meta 7 beta</string> |
| 209 | <key>gridnick</key> <string>meta7beta</string> | 209 | <key>gridnick</key> <string>meta7beta</string> |
| 210 | <key>platform</key> <string>OpenSim</string> | 210 | <key>platform</key> <string>OpenSim</string> |
| 211 | <key>loginuri</key> <string>https://login.meta7.com/</string> | 211 | <key>loginuri</key> <string>https://login.meta7.com/</string> |