diff options
| author | Jacek Antonelli | 2009-09-05 02:23:52 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-05 02:23:52 -0500 |
| commit | acfc1b1163df4fe5b238546de5697b435cd0c79e (patch) | |
| tree | 3764ee586d2464dd057c4c82ab27cc66e7e1b0f3 /linden/indra/newview/app_settings/settings.xml | |
| parent | Converted RLVa menu items to XUI. (diff) | |
| parent | Updated object backup feature to Meerkat's SVN, imported floater. (diff) | |
| download | meta-impy-acfc1b1163df4fe5b238546de5697b435cd0c79e.zip meta-impy-acfc1b1163df4fe5b238546de5697b435cd0c79e.tar.gz meta-impy-acfc1b1163df4fe5b238546de5697b435cd0c79e.tar.bz2 meta-impy-acfc1b1163df4fe5b238546de5697b435cd0c79e.tar.xz | |
Merge branch 'objectbackup' into next
Diffstat (limited to 'linden/indra/newview/app_settings/settings.xml')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 628936c..ca9d53d 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -3215,6 +3215,22 @@ | |||
| 3215 | <integer>0</integer> | 3215 | <integer>0</integer> |
| 3216 | </array> | 3216 | </array> |
| 3217 | </map> | 3217 | </map> |
| 3218 | <key>FloaterPrimImport</key> | ||
| 3219 | <map> | ||
| 3220 | <key>Comment</key> | ||
| 3221 | <string>Rectangle for import/export</string> | ||
| 3222 | <key>Persist</key> | ||
| 3223 | <integer>1</integer> | ||
| 3224 | <key>Type</key> | ||
| 3225 | <string>Rect</string> | ||
| 3226 | <key>Value</key> | ||
| 3227 | <array> | ||
| 3228 | <integer>0</integer> | ||
| 3229 | <integer>25</integer> | ||
| 3230 | <integer>400</integer> | ||
| 3231 | <integer>0</integer> | ||
| 3232 | </array> | ||
| 3233 | </map> | ||
| 3218 | <key>FloaterRegionInfo</key> | 3234 | <key>FloaterRegionInfo</key> |
| 3219 | <map> | 3235 | <map> |
| 3220 | <key>Comment</key> | 3236 | <key>Comment</key> |