diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-27 14:48:21 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-27 14:48:21 +0300 |
| commit | 621df44f2b504cb1576e613ca8ab1784e93b1a52 (patch) | |
| tree | 378279f3b0ef6169ffd1bb7b7a42282f5f8956e5 /indra/newview | |
| parent | 423398081b5c4402ebc162c43eaf29acdeb9f423 (diff) | |
| parent | c63233106b4785de86a0cff3d108e36b7db2b127 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 59b6115fab..693093c6ce 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11217,5 +11217,19 @@ <key>Value</key> <integer>178</integer> </map> + <key>always_showable_floaters</key> + <map> + <key>Comment</key> + <string>Floaters that can be shown despite mouselook mode</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>LLSD</string> + <key>Value</key> + <array> + <string>snapshot</string> + <string>mini_map</string> + </array> + </map> </map> </llsd> |