diff options
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llcontroldef.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/linden/indra/newview/llcontroldef.cpp b/linden/indra/newview/llcontroldef.cpp index 7989791..11b97b4 100644 --- a/linden/indra/newview/llcontroldef.cpp +++ b/linden/indra/newview/llcontroldef.cpp | |||
| @@ -573,7 +573,7 @@ void declare_settings() | |||
| 573 | 573 | ||
| 574 | gSavedSettings.declareBOOL("ShowAxes", FALSE, "Render coordinate frame at your position"); | 574 | gSavedSettings.declareBOOL("ShowAxes", FALSE, "Render coordinate frame at your position"); |
| 575 | 575 | ||
| 576 | gSavedSettings.declareBOOL("ShowMiniMap", FALSE, "Display mini map on login"); | 576 | gSavedSettings.declareBOOL("ShowMiniMap", TRUE, "Display mini map on login"); |
| 577 | gSavedSettings.declareBOOL("ShowWorldMap", FALSE, "Display world map on login"); | 577 | gSavedSettings.declareBOOL("ShowWorldMap", FALSE, "Display world map on login"); |
| 578 | gSavedSettings.declareBOOL("ShowToolBar", TRUE, "Show toolbar at bottom of screen"); | 578 | gSavedSettings.declareBOOL("ShowToolBar", TRUE, "Show toolbar at bottom of screen"); |
| 579 | gSavedSettings.declareBOOL("ShowCameraControls", FALSE, "Display camera controls on login"); | 579 | gSavedSettings.declareBOOL("ShowCameraControls", FALSE, "Display camera controls on login"); |
| @@ -833,7 +833,7 @@ void declare_settings() | |||
| 833 | // Previews - only width and height are used | 833 | // Previews - only width and height are used |
| 834 | gSavedSettings.declareRect("PreviewTextureRect", LLRect(0, 400, 400, 0), "Rectangle for texture preview window" ); // Only width and height are used | 834 | gSavedSettings.declareRect("PreviewTextureRect", LLRect(0, 400, 400, 0), "Rectangle for texture preview window" ); // Only width and height are used |
| 835 | gSavedSettings.declareRect("PreviewScriptRect", LLRect(0, 550, 500, 0), "Rectangle for script preview window" ); // Only width and height are used | 835 | gSavedSettings.declareRect("PreviewScriptRect", LLRect(0, 550, 500, 0), "Rectangle for script preview window" ); // Only width and height are used |
| 836 | gSavedSettings.declareRect("LSLHelpRect", LLRect(0, 500, 600, 0), "Rectangle for LSL help window" ); // Only width and height are used | 836 | gSavedSettings.declareRect("LSLHelpRect", LLRect(0, 400, 400, 0), "Rectangle for LSL help window" ); // Only width and height are used |
| 837 | gSavedSettings.declareRect("PreviewLandmarkRect", LLRect(0, 90, 300, 0), "Rectangle for landmark preview window" ); // Only width and height are used | 837 | gSavedSettings.declareRect("PreviewLandmarkRect", LLRect(0, 90, 300, 0), "Rectangle for landmark preview window" ); // Only width and height are used |
| 838 | gSavedSettings.declareRect("PreviewSoundRect", LLRect(0, 85, 300, 0), "Rectangle for sound preview window" ); // Only width and height are used | 838 | gSavedSettings.declareRect("PreviewSoundRect", LLRect(0, 85, 300, 0), "Rectangle for sound preview window" ); // Only width and height are used |
| 839 | gSavedSettings.declareRect("PreviewObjectRect", LLRect(0, 85, 300, 0), "Rectangle for object preview window" ); // Only width and height are used | 839 | gSavedSettings.declareRect("PreviewObjectRect", LLRect(0, 85, 300, 0), "Rectangle for object preview window" ); // Only width and height are used |
| @@ -1145,15 +1145,18 @@ void declare_settings() | |||
| 1145 | 1145 | ||
| 1146 | 1146 | ||
| 1147 | gSavedSettings.declareBOOL("NotifyMoneyChange", TRUE, "Pop up notifications for all financial transactions"); | 1147 | gSavedSettings.declareBOOL("NotifyMoneyChange", TRUE, "Pop up notifications for all financial transactions"); |
| 1148 | gSavedSettings.declareBOOL("ShowNewInventory", TRUE, | ||
| 1149 | "Automatic Previews of new notecards/textures/landmarks"); | ||
| 1148 | 1150 | ||
| 1149 | // Bitfield | 1151 | // Bitfield |
| 1150 | // 1 = by date | 1152 | // 1 = by date |
| 1151 | // 2 = folders always by name | 1153 | // 2 = folders always by name |
| 1154 | // 4 = system folders to top | ||
| 1152 | // This where the default first time user gets his settings. | 1155 | // This where the default first time user gets his settings. |
| 1153 | gSavedSettings.declareU32("InventorySortOrder", 1 | 2, "Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name)"); | 1156 | gSavedSettings.declareU32("InventorySortOrder", 1 | 2 | 4, "Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)"); |
| 1154 | gSavedSettings.declareU32("RecentItemsSortOrder", 1, "Specifies sort key for recent inventory items (+0 = name, +1 = date, +2 = folders always by name)"); | 1157 | gSavedSettings.declareU32("RecentItemsSortOrder", 1, "Specifies sort key for recent inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)"); |
| 1155 | gSavedSettings.declareU32("TexturePickerSortOrder", 2, "Specifies sort key for textures in texture picker (+0 = name, +1 = date, +2 = folders always by name)"); | 1158 | gSavedSettings.declareU32("TexturePickerSortOrder", 2, "Specifies sort key for textures in texture picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)"); |
| 1156 | gSavedSettings.declareU32("AvatarPickerSortOrder", 2, "Specifies sort key for textures in avatar picker (+0 = name, +1 = date, +2 = folders always by name)"); | 1159 | gSavedSettings.declareU32("AvatarPickerSortOrder", 2, "Specifies sort key for textures in avatar picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)"); |
| 1157 | 1160 | ||
| 1158 | // Pixels away from edge that windows snap. | 1161 | // Pixels away from edge that windows snap. |
| 1159 | gSavedSettings.declareS32("SnapMargin", 10, "Controls maximum distance between windows before they auto-snap together (pixels)"); | 1162 | gSavedSettings.declareS32("SnapMargin", 10, "Controls maximum distance between windows before they auto-snap together (pixels)"); |