aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/app_settings/settings.xml225
-rw-r--r--linden/indra/newview/app_settings/settings_per_account.xml231
-rw-r--r--linden/indra/newview/floaterbusy.cpp17
-rw-r--r--linden/indra/newview/llfloaterbuildoptions.cpp10
-rw-r--r--linden/indra/newview/llmanip.cpp26
-rw-r--r--linden/indra/newview/lltoolplacer.cpp20
-rw-r--r--linden/indra/newview/llviewerobjectlist.cpp28
7 files changed, 273 insertions, 284 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index a1e335d..9f2854b 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -15,231 +15,6 @@
15 <key>Value</key> 15 <key>Value</key>
16 <integer>1</integer> 16 <integer>1</integer>
17 </map> 17 </map>
18 <key>BuildPrefs_Xsize</key>
19 <map>
20 <key>Comment</key>
21 <string>Default Size For New Objects to be created X</string>
22 <key>Persist</key>
23 <integer>1</integer>
24 <key>Type</key>
25 <string>F32</string>
26 <key>Value</key>
27 <real>0.5</real>
28 </map>
29 <key>BuildPrefs_Ysize</key>
30 <map>
31 <key>Comment</key>
32 <string>Default Size For New Objects to be created Y</string>
33 <key>Persist</key>
34 <integer>1</integer>
35 <key>Type</key>
36 <string>F32</string>
37 <key>Value</key>
38 <real>0.5</real>
39 </map>
40 <key>BuildPrefs_Zsize</key>
41 <map>
42 <key>Comment</key>
43 <string>Default Size For New Objects to be created Z</string>
44 <key>Persist</key>
45 <integer>1</integer>
46 <key>Type</key>
47 <string>F32</string>
48 <key>Value</key>
49 <real>0.5</real>
50 </map>
51 <key>BuildPrefs_Phantom</key>
52 <map>
53 <key>Comment</key>
54 <string>Default Setting For New Objects to be created, phantom flag</string>
55 <key>Persist</key>
56 <integer>1</integer>
57 <key>Type</key>
58 <string>Boolean</string>
59 <key>Value</key>
60 <integer>0</integer>
61 </map>
62 <key>BuildPrefs_Temporary</key>
63 <map>
64 <key>Comment</key>
65 <string>Default Setting For New Objects to be created, temp flag</string>
66 <key>Persist</key>
67 <integer>1</integer>
68 <key>Type</key>
69 <string>Boolean</string>
70 <key>Value</key>
71 <integer>0</integer>
72 </map>
73 <key>BuildPrefs_Physical</key>
74 <map>
75 <key>Comment</key>
76 <string>Default Setting For New Objects to be created, physical flag</string>
77 <key>Persist</key>
78 <integer>1</integer>
79 <key>Type</key>
80 <string>Boolean</string>
81 <key>Value</key>
82 <integer>0</integer>
83 </map>
84 <key>BuildPrefs_EmbedItem</key>
85 <map>
86 <key>Comment</key>
87 <string>Whether to add item to objects</string>
88 <key>Persist</key>
89 <integer>1</integer>
90 <key>Type</key>
91 <string>Boolean</string>
92 <key>Value</key>
93 <integer>0</integer>
94 </map>
95 <key>BuildPrefs_Material</key>
96 <map>
97 <key>Comment</key>
98 <string>Default Setting For New Objects to be created, physical flag</string>
99 <key>Persist</key>
100 <integer>1</integer>
101 <key>Type</key>
102 <string>String</string>
103 <key>Value</key>
104 <string>Wood</string>
105 </map>
106 <key>BuildPrefs_Color</key>
107 <map>
108 <key>Comment</key>
109 <string>Color of new objects textures</string>
110 <key>Persist</key>
111 <integer>1</integer>
112 <key>Type</key>
113 <string>Color4</string>
114 <key>Value</key>
115 <array>
116 <real>1.0</real>
117 <real>1.0</real>
118 <real>1.0</real>
119 <real>1.0</real>
120 </array>
121 </map>
122 <key>BuildPrefs_Texture</key>
123 <map>
124 <key>Comment</key>
125 <string>Texture used as 'Default' for new object created</string>
126 <key>Persist</key>
127 <integer>1</integer>
128 <key>Type</key>
129 <string>String</string>
130 <key>Value</key>
131 <string>89556747-24cb-43ed-920b-47caed15465f</string>
132 </map>
133 <key>BuildPrefs_Item</key>
134 <map>
135 <key>Comment</key>
136 <string>item added to new object created</string>
137 <key>Persist</key>
138 <integer>1</integer>
139 <key>Type</key>
140 <string>String</string>
141 <key>Value</key>
142 <string></string>
143 </map>
144 <key>BuildPrefs_Alpha</key>
145 <map>
146 <key>Comment</key>
147 <string>Default Alpha For New Objects to be created</string>
148 <key>Persist</key>
149 <integer>1</integer>
150 <key>Type</key>
151 <string>F32</string>
152 <key>Value</key>
153 <real>0.0</real>
154 </map>
155 <key>BuildPrefs_Glow</key>
156 <map>
157 <key>Comment</key>
158 <string>Default Glow For New Objects to be created</string>
159 <key>Persist</key>
160 <integer>1</integer>
161 <key>Type</key>
162 <string>F32</string>
163 <key>Value</key>
164 <real>0.0</real>
165 </map>
166 <key>BuildPrefs_FullBright</key>
167 <map>
168 <key>Comment</key>
169 <string>Default Setting For New Objects to be created, whether textures are full bright</string>
170 <key>Persist</key>
171 <integer>1</integer>
172 <key>Type</key>
173 <string>Boolean</string>
174 <key>Value</key>
175 <integer>0</integer>
176 </map>
177 <key>BuildPrefs_Shiny</key>
178 <map>
179 <key>Comment</key>
180 <string>Shiny level used as 'Default' for new objects created</string>
181 <key>Persist</key>
182 <integer>1</integer>
183 <key>Type</key>
184 <string>String</string>
185 <key>Value</key>
186 <string>None</string>
187 </map>
188 <key>BuildPrefs_PivotX</key>
189 <map>
190 <key>Comment</key>
191 <string>Pivot point on the X axis</string>
192 <key>Persist</key>
193 <integer>1</integer>
194 <key>Type</key>
195 <string>F32</string>
196 <key>Value</key>
197 <real>50</real>
198 </map>
199 <key>BuildPrefs_PivotY</key>
200 <map>
201 <key>Comment</key>
202 <string>Pivot point on the Y axis</string>
203 <key>Persist</key>
204 <integer>1</integer>
205 <key>Type</key>
206 <string>F32</string>
207 <key>Value</key>
208 <real>50</real>
209 </map>
210 <key>BuildPrefs_PivotZ</key>
211 <map>
212 <key>Comment</key>
213 <string>Pivot point on the Z axis</string>
214 <key>Persist</key>
215 <integer>1</integer>
216 <key>Type</key>
217 <string>F32</string>
218 <key>Value</key>
219 <real>50</real>
220 </map>
221 <key>BuildPrefs_PivotIsPercent</key>
222 <map>
223 <key>Comment</key>
224 <string>Consider the Pivot points values as a percentage</string>
225 <key>Persist</key>
226 <integer>1</integer>
227 <key>Type</key>
228 <string>Boolean</string>
229 <key>Value</key>
230 <integer>1</integer>
231 </map>
232 <key>BuildPrefs_ActualRoot</key>
233 <map>
234 <key>Comment</key>
235 <string>Show the axis on the actual root of a linkset instead of mass center</string>
236 <key>Persist</key>
237 <integer>1</integer>
238 <key>Type</key>
239 <string>Boolean</string>
240 <key>Value</key>
241 <integer>0</integer>
242 </map>
243 <key>DisableLoginLogoutScreens</key> 18 <key>DisableLoginLogoutScreens</key>
244 <map> 19 <map>
245 <key>Comment</key> 20 <key>Comment</key>
diff --git a/linden/indra/newview/app_settings/settings_per_account.xml b/linden/indra/newview/app_settings/settings_per_account.xml
index 071e53c..83852d3 100644
--- a/linden/indra/newview/app_settings/settings_per_account.xml
+++ b/linden/indra/newview/app_settings/settings_per_account.xml
@@ -229,6 +229,237 @@
229 229
230 <!-- End AO --> 230 <!-- End AO -->
231 231
232 <!-- Begin build -->
233
234
235 <key>BuildPrefs_Xsize</key>
236 <map>
237 <key>Comment</key>
238 <string>Default Size For New Objects to be created X</string>
239 <key>Persist</key>
240 <integer>1</integer>
241 <key>Type</key>
242 <string>F32</string>
243 <key>Value</key>
244 <real>0.5</real>
245 </map>
246 <key>BuildPrefs_Ysize</key>
247 <map>
248 <key>Comment</key>
249 <string>Default Size For New Objects to be created Y</string>
250 <key>Persist</key>
251 <integer>1</integer>
252 <key>Type</key>
253 <string>F32</string>
254 <key>Value</key>
255 <real>0.5</real>
256 </map>
257 <key>BuildPrefs_Zsize</key>
258 <map>
259 <key>Comment</key>
260 <string>Default Size For New Objects to be created Z</string>
261 <key>Persist</key>
262 <integer>1</integer>
263 <key>Type</key>
264 <string>F32</string>
265 <key>Value</key>
266 <real>0.5</real>
267 </map>
268 <key>BuildPrefs_Phantom</key>
269 <map>
270 <key>Comment</key>
271 <string>Default Setting For New Objects to be created, phantom flag</string>
272 <key>Persist</key>
273 <integer>1</integer>
274 <key>Type</key>
275 <string>Boolean</string>
276 <key>Value</key>
277 <integer>0</integer>
278 </map>
279 <key>BuildPrefs_Temporary</key>
280 <map>
281 <key>Comment</key>
282 <string>Default Setting For New Objects to be created, temp flag</string>
283 <key>Persist</key>
284 <integer>1</integer>
285 <key>Type</key>
286 <string>Boolean</string>
287 <key>Value</key>
288 <integer>0</integer>
289 </map>
290 <key>BuildPrefs_Physical</key>
291 <map>
292 <key>Comment</key>
293 <string>Default Setting For New Objects to be created, physical flag</string>
294 <key>Persist</key>
295 <integer>1</integer>
296 <key>Type</key>
297 <string>Boolean</string>
298 <key>Value</key>
299 <integer>0</integer>
300 </map>
301 <key>BuildPrefs_EmbedItem</key>
302 <map>
303 <key>Comment</key>
304 <string>Whether to add item to objects</string>
305 <key>Persist</key>
306 <integer>1</integer>
307 <key>Type</key>
308 <string>Boolean</string>
309 <key>Value</key>
310 <integer>0</integer>
311 </map>
312 <key>BuildPrefs_Material</key>
313 <map>
314 <key>Comment</key>
315 <string>Default Setting For New Objects to be created, physical flag</string>
316 <key>Persist</key>
317 <integer>1</integer>
318 <key>Type</key>
319 <string>String</string>
320 <key>Value</key>
321 <string>Wood</string>
322 </map>
323 <key>BuildPrefs_Color</key>
324 <map>
325 <key>Comment</key>
326 <string>Color of new objects textures</string>
327 <key>Persist</key>
328 <integer>1</integer>
329 <key>Type</key>
330 <string>Color4</string>
331 <key>Value</key>
332 <array>
333 <real>1.0</real>
334 <real>1.0</real>
335 <real>1.0</real>
336 <real>1.0</real>
337 </array>
338 </map>
339 <key>BuildPrefs_Texture</key>
340 <map>
341 <key>Comment</key>
342 <string>Texture used as 'Default' for new object created</string>
343 <key>Persist</key>
344 <integer>1</integer>
345 <key>Type</key>
346 <string>String</string>
347 <key>Value</key>
348 <string>89556747-24cb-43ed-920b-47caed15465f</string>
349 </map>
350 <key>BuildPrefs_Item</key>
351 <map>
352 <key>Comment</key>
353 <string>item added to new object created</string>
354 <key>Persist</key>
355 <integer>1</integer>
356 <key>Type</key>
357 <string>String</string>
358 <key>Value</key>
359 <string></string>
360 </map>
361 <key>BuildPrefs_Alpha</key>
362 <map>
363 <key>Comment</key>
364 <string>Default Alpha For New Objects to be created</string>
365 <key>Persist</key>
366 <integer>1</integer>
367 <key>Type</key>
368 <string>F32</string>
369 <key>Value</key>
370 <real>0.0</real>
371 </map>
372 <key>BuildPrefs_Glow</key>
373 <map>
374 <key>Comment</key>
375 <string>Default Glow For New Objects to be created</string>
376 <key>Persist</key>
377 <integer>1</integer>
378 <key>Type</key>
379 <string>F32</string>
380 <key>Value</key>
381 <real>0.0</real>
382 </map>
383 <key>BuildPrefs_FullBright</key>
384 <map>
385 <key>Comment</key>
386 <string>Default Setting For New Objects to be created, whether textures are full bright</string>
387 <key>Persist</key>
388 <integer>1</integer>
389 <key>Type</key>
390 <string>Boolean</string>
391 <key>Value</key>
392 <integer>0</integer>
393 </map>
394 <key>BuildPrefs_Shiny</key>
395 <map>
396 <key>Comment</key>
397 <string>Shiny level used as 'Default' for new objects created</string>
398 <key>Persist</key>
399 <integer>1</integer>
400 <key>Type</key>
401 <string>String</string>
402 <key>Value</key>
403 <string>None</string>
404 </map>
405 <key>BuildPrefs_PivotX</key>
406 <map>
407 <key>Comment</key>
408 <string>Pivot point on the X axis</string>
409 <key>Persist</key>
410 <integer>1</integer>
411 <key>Type</key>
412 <string>F32</string>
413 <key>Value</key>
414 <real>50</real>
415 </map>
416 <key>BuildPrefs_PivotY</key>
417 <map>
418 <key>Comment</key>
419 <string>Pivot point on the Y axis</string>
420 <key>Persist</key>
421 <integer>1</integer>
422 <key>Type</key>
423 <string>F32</string>
424 <key>Value</key>
425 <real>50</real>
426 </map>
427 <key>BuildPrefs_PivotZ</key>
428 <map>
429 <key>Comment</key>
430 <string>Pivot point on the Z axis</string>
431 <key>Persist</key>
432 <integer>1</integer>
433 <key>Type</key>
434 <string>F32</string>
435 <key>Value</key>
436 <real>50</real>
437 </map>
438 <key>BuildPrefs_PivotIsPercent</key>
439 <map>
440 <key>Comment</key>
441 <string>Consider the Pivot points values as a percentage</string>
442 <key>Persist</key>
443 <integer>1</integer>
444 <key>Type</key>
445 <string>Boolean</string>
446 <key>Value</key>
447 <integer>1</integer>
448 </map>
449 <key>BuildPrefs_ActualRoot</key>
450 <map>
451 <key>Comment</key>
452 <string>Show the axis on the actual root of a linkset instead of mass center</string>
453 <key>Persist</key>
454 <integer>1</integer>
455 <key>Type</key>
456 <string>Boolean</string>
457 <key>Value</key>
458 <integer>0</integer>
459 </map>
460
461 <!-- End build-->
462
232 <!-- Begin IM auto-response --> 463 <!-- Begin IM auto-response -->
233 464
234 <key>InstantMessageResponseFriends</key> 465 <key>InstantMessageResponseFriends</key>
diff --git a/linden/indra/newview/floaterbusy.cpp b/linden/indra/newview/floaterbusy.cpp
index 5823dfa..9188ae1 100644
--- a/linden/indra/newview/floaterbusy.cpp
+++ b/linden/indra/newview/floaterbusy.cpp
@@ -147,27 +147,10 @@ BOOL FloaterBusy::postBuild()
147 { 147 {
148 childSetValue("im_give_disp_rect_txt","Currently set to a item not on this account"); 148 childSetValue("im_give_disp_rect_txt","Currently set to a item not on this account");
149 } 149 }
150
151 itemid = (LLUUID)gSavedSettings.getString("EmeraldBuildPrefs_Item");
152 item = gInventory.getItem(itemid);
153
154 if (item)
155 {
156 childSetValue("build_item_add_disp_rect_txt","Currently set to: "+item->getName());
157 }
158 else if (itemid.isNull())
159 {
160 childSetValue("build_item_add_disp_rect_txt","Currently not set");
161 }
162 else
163 {
164 childSetValue("build_item_add_disp_rect_txt","Currently set to a item not on this account");
165 }
166 } 150 }
167 else 151 else
168 { 152 {
169 childSetValue("im_give_disp_rect_txt","Not logged in"); 153 childSetValue("im_give_disp_rect_txt","Not logged in");
170 childSetValue("build_item_add_disp_rect_txt","Not logged in");
171 } 154 }
172 155
173 LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("InstantMessageResponse") ); 156 LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("InstantMessageResponse") );
diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index 472f6bb..6c59a4e 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -80,8 +80,8 @@ LLFloaterBuildOptions::~LLFloaterBuildOptions()
80 80
81BOOL LLFloaterBuildOptions::postBuild() 81BOOL LLFloaterBuildOptions::postBuild()
82{ 82{
83 getChild<LLComboBox>("material")->setSimple(gSavedSettings.getString("BuildPrefs_Material")); 83 getChild<LLComboBox>("material")->setSimple(gSavedPerAccountSettings.getString("BuildPrefs_Material"));
84 getChild<LLComboBox>("combobox shininess")->setSimple(gSavedSettings.getString("BuildPrefs_Shiny")); 84 getChild<LLComboBox>("combobox shininess")->setSimple(gSavedPerAccountSettings.getString("BuildPrefs_Shiny"));
85 85
86 getChild<LLComboBox>("material")->setCommitCallback(onComboBoxCommit); 86 getChild<LLComboBox>("material")->setCommitCallback(onComboBoxCommit);
87 getChild<LLComboBox>("combobox shininess")->setCommitCallback(onComboBoxCommit); 87 getChild<LLComboBox>("combobox shininess")->setCommitCallback(onComboBoxCommit);
@@ -102,7 +102,7 @@ BOOL LLFloaterBuildOptions::postBuild()
102 102
103 if (LLStartUp::getStartupState() == STATE_STARTED) 103 if (LLStartUp::getStartupState() == STATE_STARTED)
104 { 104 {
105 LLUUID itemid = (LLUUID)gSavedSettings.getString("BuildPrefs_Item"); 105 LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("BuildPrefs_Item");
106 LLViewerInventoryItem* item = gInventory.getItem(itemid); 106 LLViewerInventoryItem* item = gInventory.getItem(itemid);
107 if (item) 107 if (item)
108 { 108 {
@@ -154,7 +154,7 @@ BOOL LLFloaterBuildOptions::visible(void*)
154 154
155void LLFloaterBuildOptions::BuildAutoResponseItemDrop(LLViewerInventoryItem* item) 155void LLFloaterBuildOptions::BuildAutoResponseItemDrop(LLViewerInventoryItem* item)
156{ 156{
157 gSavedSettings.setString("BuildPrefs_Item", item->getUUID().asString()); 157 gSavedPerAccountSettings.setString("BuildPrefs_Item", item->getUUID().asString());
158 LLFloaterBuildOptions::getInstance()->childSetValue("build_item_add_disp_rect_txt", "Currently set to: "+item->getName()); 158 LLFloaterBuildOptions::getInstance()->childSetValue("build_item_add_disp_rect_txt", "Currently set to: "+item->getName());
159} 159}
160 160
@@ -173,6 +173,6 @@ void LLFloaterBuildOptions::onTexturePickerCommit(LLUICtrl* ctrl, void* userdata
173 LLTextureCtrl* image_ctrl = (LLTextureCtrl*)ctrl; 173 LLTextureCtrl* image_ctrl = (LLTextureCtrl*)ctrl;
174 if(image_ctrl) 174 if(image_ctrl)
175 { 175 {
176 gSavedSettings.setString("BuildPrefs_Texture", image_ctrl->getImageAssetID().asString()); 176 gSavedPerAccountSettings.setString("BuildPrefs_Texture", image_ctrl->getImageAssetID().asString());
177 } 177 }
178} 178}
diff --git a/linden/indra/newview/llmanip.cpp b/linden/indra/newview/llmanip.cpp
index fd24f6d..45550fc 100644
--- a/linden/indra/newview/llmanip.cpp
+++ b/linden/indra/newview/llmanip.cpp
@@ -106,20 +106,20 @@ LLManip::LLManip( const std::string& name, LLToolComposite* composite )
106{ 106{
107 initPivot(); 107 initPivot();
108 108
109 gSavedSettings.getControl("BuildPrefs_ActualRoot")->getSignal()->connect(&updateActualRoot); 109 gSavedPerAccountSettings.getControl("BuildPrefs_ActualRoot")->getSignal()->connect(&updateActualRoot);
110 gSavedSettings.getControl("BuildPrefs_PivotIsPercent")->getSignal()->connect(&updatePivotIsPercent); 110 gSavedPerAccountSettings.getControl("BuildPrefs_PivotIsPercent")->getSignal()->connect(&updatePivotIsPercent);
111 gSavedSettings.getControl("BuildPrefs_PivotX")->getSignal()->connect(&updatePivotX); 111 gSavedPerAccountSettings.getControl("BuildPrefs_PivotX")->getSignal()->connect(&updatePivotX);
112 gSavedSettings.getControl("BuildPrefs_PivotY")->getSignal()->connect(&updatePivotY); 112 gSavedPerAccountSettings.getControl("BuildPrefs_PivotY")->getSignal()->connect(&updatePivotY);
113 gSavedSettings.getControl("BuildPrefs_PivotZ")->getSignal()->connect(&updatePivotZ); 113 gSavedPerAccountSettings.getControl("BuildPrefs_PivotZ")->getSignal()->connect(&updatePivotZ);
114} 114}
115//static 115//static
116void LLManip::initPivot() 116void LLManip::initPivot()
117{ 117{
118 sActualRoot = (bool)gSavedSettings.getBOOL("BuildPrefs_ActualRoot"); 118 sActualRoot = (bool)gSavedPerAccountSettings.getBOOL("BuildPrefs_ActualRoot");
119 sPivotPerc = (bool)gSavedSettings.getBOOL("BuildPrefs_PivotIsPercent"); 119 sPivotPerc = (bool)gSavedPerAccountSettings.getBOOL("BuildPrefs_PivotIsPercent");
120 sPivotX = gSavedSettings.getF32("BuildPrefs_PivotX"); 120 sPivotX = gSavedPerAccountSettings.getF32("BuildPrefs_PivotX");
121 sPivotY = gSavedSettings.getF32("BuildPrefs_PivotY"); 121 sPivotY = gSavedPerAccountSettings.getF32("BuildPrefs_PivotY");
122 sPivotZ = gSavedSettings.getF32("BuildPrefs_PivotZ"); 122 sPivotZ = gSavedPerAccountSettings.getF32("BuildPrefs_PivotZ");
123} 123}
124//static 124//static
125void LLManip::updateActualRoot(const LLSD &data) 125void LLManip::updateActualRoot(const LLSD &data)
@@ -420,9 +420,9 @@ LLVector3 LLManip::getPivotPoint()
420 pos = pos + add; 420 pos = pos + add;
421 }else 421 }else
422 { 422 {
423 //pos[VX] = pos[VX] + gSavedSettings.getF32("BuildPrefs_PivotX"); 423 //pos[VX] = pos[VX] + gSavedPerAccountSettings.getF32("BuildPrefs_PivotX");
424 //pos[VY] = pos[VY] + gSavedSettings.getF32("BuildPrefs_PivotY"); 424 //pos[VY] = pos[VY] + gSavedPerAccountSettings.getF32("BuildPrefs_PivotY");
425 //pos[VZ] = pos[VZ] + gSavedSettings.getF32("BuildPrefs_PivotZ"); 425 //pos[VZ] = pos[VZ] + gSavedPerAccountSettings.getF32("BuildPrefs_PivotZ");
426 LLVector3 add( 426 LLVector3 add(
427 sPivotX, 427 sPivotX,
428 sPivotY, 428 sPivotY,
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index dc4d6bf..18793c5 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -217,17 +217,17 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
217 // Set params for new object based on its PCode. 217 // Set params for new object based on its PCode.
218 LLQuaternion rotation; 218 LLQuaternion rotation;
219 LLVector3 scale = LLVector3( 219 LLVector3 scale = LLVector3(
220 gSavedSettings.getF32("BuildPrefs_Xsize"), 220 gSavedPerAccountSettings.getF32("BuildPrefs_Xsize"),
221 gSavedSettings.getF32("BuildPrefs_Ysize"), 221 gSavedPerAccountSettings.getF32("BuildPrefs_Ysize"),
222 gSavedSettings.getF32("BuildPrefs_Zsize")); 222 gSavedPerAccountSettings.getF32("BuildPrefs_Zsize"));
223 223
224 U8 material = LL_MCODE_WOOD; 224 U8 material = LL_MCODE_WOOD;
225 if(gSavedSettings.getString("BuildPrefs_Material")== "Stone") material = LL_MCODE_STONE; 225 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Stone") material = LL_MCODE_STONE;
226 if(gSavedSettings.getString("BuildPrefs_Material")== "Metal") material = LL_MCODE_METAL; 226 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Metal") material = LL_MCODE_METAL;
227 if(gSavedSettings.getString("BuildPrefs_Material")== "Wood") material = LL_MCODE_WOOD; 227 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Wood") material = LL_MCODE_WOOD;
228 if(gSavedSettings.getString("BuildPrefs_Material")== "Flesh") material = LL_MCODE_FLESH; 228 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Flesh") material = LL_MCODE_FLESH;
229 if(gSavedSettings.getString("BuildPrefs_Material")== "Rubber") material = LL_MCODE_RUBBER; 229 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Rubber") material = LL_MCODE_RUBBER;
230 if(gSavedSettings.getString("BuildPrefs_Material")== "Plastic") material = LL_MCODE_PLASTIC; 230 if(gSavedPerAccountSettings.getString("BuildPrefs_Material")== "Plastic") material = LL_MCODE_PLASTIC;
231 231
232 232
233 233
@@ -298,7 +298,7 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
298 gMessageSystem->addU8Fast(_PREHASH_Material, material); 298 gMessageSystem->addU8Fast(_PREHASH_Material, material);
299 299
300 U32 flags = 0; // not selected 300 U32 flags = 0; // not selected
301 if (use_physics || gSavedSettings.getBOOL("BuildPrefs_Physical")) 301 if (use_physics || gSavedPerAccountSettings.getBOOL("BuildPrefs_Physical"))
302 { 302 {
303 flags |= FLAGS_USE_PHYSICS; 303 flags |= FLAGS_USE_PHYSICS;
304 } 304 }
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 78f374c..a251d17 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -279,20 +279,20 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
279 LLPrimitive obj; 279 LLPrimitive obj;
280 obj.setNumTEs(U8(10)); 280 obj.setNumTEs(U8(10));
281 S32 shinnyLevel = 0; 281 S32 shinnyLevel = 0;
282 if(gSavedSettings.getString("BuildPrefs_Shiny")== "None") shinnyLevel = 0; 282 if(gSavedPerAccountSettings.getString("BuildPrefs_Shiny")== "None") shinnyLevel = 0;
283 if(gSavedSettings.getString("BuildPrefs_Shiny")== "Low") shinnyLevel = 1; 283 if(gSavedPerAccountSettings.getString("BuildPrefs_Shiny")== "Low") shinnyLevel = 1;
284 if(gSavedSettings.getString("BuildPrefs_Shiny")== "Medium") shinnyLevel = 2; 284 if(gSavedPerAccountSettings.getString("BuildPrefs_Shiny")== "Medium") shinnyLevel = 2;
285 if(gSavedSettings.getString("BuildPrefs_Shiny")== "High") shinnyLevel = 3; 285 if(gSavedPerAccountSettings.getString("BuildPrefs_Shiny")== "High") shinnyLevel = 3;
286 286
287 for (int i = 0; i < 10; i++) 287 for (int i = 0; i < 10; i++)
288 { 288 {
289 // I'm assuming this is because there's no good workaround for setting the default 289 // I'm assuming this is because there's no good workaround for setting the default
290 // box texture manually without restarting? -- MC 290 // box texture manually without restarting? -- MC
291 LLTextureEntry tex = LLTextureEntry(LLUUID(gSavedSettings.getString("BuildPrefs_Texture"))); 291 LLTextureEntry tex = LLTextureEntry(LLUUID(gSavedPerAccountSettings.getString("BuildPrefs_Texture")));
292 tex.setColor(gSavedSettings.getColor4("BuildPrefs_Color")); 292 tex.setColor(gSavedPerAccountSettings.getColor4("BuildPrefs_Color"));
293 tex.setAlpha(1.0 - ((gSavedSettings.getF32("BuildPrefs_Alpha")) / 100.0)); 293 tex.setAlpha(1.0 - ((gSavedPerAccountSettings.getF32("BuildPrefs_Alpha")) / 100.0));
294 tex.setGlow(gSavedSettings.getF32("BuildPrefs_Glow")); 294 tex.setGlow(gSavedPerAccountSettings.getF32("BuildPrefs_Glow"));
295 if(gSavedSettings.getBOOL("BuildPrefs_FullBright")) 295 if(gSavedPerAccountSettings.getBOOL("BuildPrefs_FullBright"))
296 { 296 {
297 tex.setFullbright(TEM_FULLBRIGHT_MASK); 297 tex.setFullbright(TEM_FULLBRIGHT_MASK);
298 } 298 }
@@ -311,15 +311,15 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
311 msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() ); 311 msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
312 msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID()); 312 msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
313 msg->addU32Fast(_PREHASH_ObjectLocalID, (U32)(objectp->mLocalID) ); 313 msg->addU32Fast(_PREHASH_ObjectLocalID, (U32)(objectp->mLocalID) );
314 msg->addBOOLFast(_PREHASH_UsePhysics, gSavedSettings.getBOOL("BuildPrefs_Physical")); 314 msg->addBOOLFast(_PREHASH_UsePhysics, gSavedPerAccountSettings.getBOOL("BuildPrefs_Physical"));
315 msg->addBOOL("IsTemporary", gSavedSettings.getBOOL("BuildPrefs_Temporary")); 315 msg->addBOOL("IsTemporary", gSavedPerAccountSettings.getBOOL("BuildPrefs_Temporary"));
316 msg->addBOOL("IsPhantom", gSavedSettings.getBOOL("BuildPrefs_Phantom") ); 316 msg->addBOOL("IsPhantom", gSavedPerAccountSettings.getBOOL("BuildPrefs_Phantom") );
317 msg->addBOOL("CastsShadows", true ); 317 msg->addBOOL("CastsShadows", true );
318 msg->sendReliable(gAgent.getRegion()->getHost()); 318 msg->sendReliable(gAgent.getRegion()->getHost());
319 319
320 if(gSavedSettings.getBOOL("BuildPrefs_EmbedItem")) 320 if(gSavedPerAccountSettings.getBOOL("BuildPrefs_EmbedItem"))
321 { 321 {
322 LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getItem((LLUUID)gSavedSettings.getString("BuildPrefs_Item")); 322 LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getItem((LLUUID)gSavedPerAccountSettings.getString("BuildPrefs_Item"));
323 if(item) 323 if(item)
324 { 324 {
325 if(item->getType()==LLAssetType::AT_LSL_TEXT) 325 if(item->getType()==LLAssetType::AT_LSL_TEXT)
generated by cgit v1.1 at 2025-02-16 03:07:00 +0000