aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJeff Ames2008-07-06 14:02:22 +0000
committerJeff Ames2008-07-06 14:02:22 +0000
commitd470d30c09fde202f708a9c8af763f5d16e18bfb (patch)
tree6a86572d268dda911a5208bf5be1a1f2c19adc3c /OpenSim/Framework
parentRemove scripts that don't really belong in OpenSim SVN. (diff)
downloadopensim-SC_OLD-d470d30c09fde202f708a9c8af763f5d16e18bfb.zip
opensim-SC_OLD-d470d30c09fde202f708a9c8af763f5d16e18bfb.tar.gz
opensim-SC_OLD-d470d30c09fde202f708a9c8af763f5d16e18bfb.tar.bz2
opensim-SC_OLD-d470d30c09fde202f708a9c8af763f5d16e18bfb.tar.xz
Copyright notices and formatting cleanup.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/IAvatarService.cs29
-rw-r--r--OpenSim/Framework/RegionInfo.cs2
-rw-r--r--OpenSim/Framework/RegionSettings.cs400
-rw-r--r--OpenSim/Framework/Servers/OSHttpRequestPump.cs2
4 files changed, 230 insertions, 203 deletions
diff --git a/OpenSim/Framework/Communications/IAvatarService.cs b/OpenSim/Framework/Communications/IAvatarService.cs
index a3494cf..0e4a349 100644
--- a/OpenSim/Framework/Communications/IAvatarService.cs
+++ b/OpenSim/Framework/Communications/IAvatarService.cs
@@ -1,4 +1,31 @@
1using System; 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Text; 30using System.Text;
4using libsecondlife; 31using libsecondlife;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 924a566..d77c82d 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -285,7 +285,7 @@ namespace OpenSim.Framework
285 { 285 {
286 get 286 get
287 { 287 {
288 if(m_regionSettings == null) 288 if (m_regionSettings == null)
289 { 289 {
290 m_regionSettings = new RegionSettings(); 290 m_regionSettings = new RegionSettings();
291 } 291 }
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 4043bca..06cf7bf 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Framework
135 135
136 public bool HandleIncomingConfiguration(string key, object value) 136 public bool HandleIncomingConfiguration(string key, object value)
137 { 137 {
138 switch(key) 138 switch (key)
139 { 139 {
140 case "region_flags": 140 case "region_flags":
141 Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value; 141 Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value;
@@ -171,7 +171,7 @@ namespace OpenSim.Framework
171 break; 171 break;
172 case "sim_access": 172 case "sim_access":
173 int access = (int)value; 173 int access = (int)value;
174 if(access <= 13) 174 if (access <= 13)
175 m_Maturity = 0; 175 m_Maturity = 0;
176 else 176 else
177 m_Maturity = 1; 177 m_Maturity = 1;
@@ -236,266 +236,266 @@ namespace OpenSim.Framework
236 236
237 private LLUUID m_RegionUUID = LLUUID.Zero; 237 private LLUUID m_RegionUUID = LLUUID.Zero;
238 238
239 public LLUUID RegionUUID 239 public LLUUID RegionUUID
240 { 240 {
241 get { return m_RegionUUID; } 241 get { return m_RegionUUID; }
242 set { m_RegionUUID = value; } 242 set { m_RegionUUID = value; }
243 } 243 }
244 244
245 private bool m_BlockTerraform = false; 245 private bool m_BlockTerraform = false;
246 246
247 public bool BlockTerraform 247 public bool BlockTerraform
248 { 248 {
249 get { return m_BlockTerraform; } 249 get { return m_BlockTerraform; }
250 set { m_BlockTerraform = value; } 250 set { m_BlockTerraform = value; }
251 } 251 }
252 252
253 private bool m_BlockFly = false; 253 private bool m_BlockFly = false;
254 254
255 public bool BlockFly 255 public bool BlockFly
256 { 256 {
257 get { return m_BlockFly; } 257 get { return m_BlockFly; }
258 set { m_BlockFly = value; } 258 set { m_BlockFly = value; }
259 } 259 }
260 260
261 private bool m_AllowDamage = false; 261 private bool m_AllowDamage = false;
262 262
263 public bool AllowDamage 263 public bool AllowDamage
264 { 264 {
265 get { return m_AllowDamage; } 265 get { return m_AllowDamage; }
266 set { m_AllowDamage = value; } 266 set { m_AllowDamage = value; }
267 } 267 }
268 268
269 private bool m_RestrictPushing = false; 269 private bool m_RestrictPushing = false;
270 270
271 public bool RestrictPushing 271 public bool RestrictPushing
272 { 272 {
273 get { return m_RestrictPushing; } 273 get { return m_RestrictPushing; }
274 set { m_RestrictPushing = value; } 274 set { m_RestrictPushing = value; }
275 } 275 }
276 276
277 private bool m_AllowLandResell = true; 277 private bool m_AllowLandResell = true;
278 278
279 public bool AllowLandResell 279 public bool AllowLandResell
280 { 280 {
281 get { return m_AllowLandResell; } 281 get { return m_AllowLandResell; }
282 set { m_AllowLandResell = value; } 282 set { m_AllowLandResell = value; }
283 } 283 }
284 284
285 private bool m_AllowLandJoinDivide = true; 285 private bool m_AllowLandJoinDivide = true;
286 286
287 public bool AllowLandJoinDivide 287 public bool AllowLandJoinDivide
288 { 288 {
289 get { return m_AllowLandJoinDivide; } 289 get { return m_AllowLandJoinDivide; }
290 set { m_AllowLandJoinDivide = value; } 290 set { m_AllowLandJoinDivide = value; }
291 } 291 }
292 292
293 private bool m_BlockShowInSearch = false; 293 private bool m_BlockShowInSearch = false;
294 294
295 public bool BlockShowInSearch 295 public bool BlockShowInSearch
296 { 296 {
297 get { return m_BlockShowInSearch; } 297 get { return m_BlockShowInSearch; }
298 set { m_BlockShowInSearch = value; } 298 set { m_BlockShowInSearch = value; }
299 } 299 }
300 300
301 private int m_AgentLimit = 40; 301 private int m_AgentLimit = 40;
302 302
303 public int AgentLimit 303 public int AgentLimit
304 { 304 {
305 get { return m_AgentLimit; } 305 get { return m_AgentLimit; }
306 set { m_AgentLimit = value; } 306 set { m_AgentLimit = value; }
307 } 307 }
308 308
309 private double m_ObjectBonus = 1.0; 309 private double m_ObjectBonus = 1.0;
310 310
311 public double ObjectBonus 311 public double ObjectBonus
312 { 312 {
313 get { return m_ObjectBonus; } 313 get { return m_ObjectBonus; }
314 set { m_ObjectBonus = value; } 314 set { m_ObjectBonus = value; }
315 } 315 }
316 316
317 private int m_Maturity = 1; 317 private int m_Maturity = 1;
318 318
319 public int Maturity 319 public int Maturity
320 { 320 {
321 get { return m_Maturity; } 321 get { return m_Maturity; }
322 set { m_Maturity = value; } 322 set { m_Maturity = value; }
323 } 323 }
324 324
325 private bool m_DisableScripts = false; 325 private bool m_DisableScripts = false;
326 326
327 public bool DisableScripts 327 public bool DisableScripts
328 { 328 {
329 get { return m_DisableScripts; } 329 get { return m_DisableScripts; }
330 set { m_DisableScripts = value; } 330 set { m_DisableScripts = value; }
331 } 331 }
332 332
333 private bool m_DisableCollisions = false; 333 private bool m_DisableCollisions = false;
334 334
335 public bool DisableCollisions 335 public bool DisableCollisions
336 { 336 {
337 get { return m_DisableCollisions; } 337 get { return m_DisableCollisions; }
338 set { m_DisableCollisions = value; } 338 set { m_DisableCollisions = value; }
339 } 339 }
340 340
341 private bool m_DisablePhysics = false; 341 private bool m_DisablePhysics = false;
342 342
343 public bool DisablePhysics 343 public bool DisablePhysics
344 { 344 {
345 get { return m_DisablePhysics; } 345 get { return m_DisablePhysics; }
346 set { m_DisablePhysics = value; } 346 set { m_DisablePhysics = value; }
347 } 347 }
348 348
349 private LLUUID m_TerrainTexture1 = LLUUID.Zero; 349 private LLUUID m_TerrainTexture1 = LLUUID.Zero;
350 350
351 public LLUUID TerrainTexture1 351 public LLUUID TerrainTexture1
352 { 352 {
353 get { return m_TerrainTexture1; } 353 get { return m_TerrainTexture1; }
354 set { m_TerrainTexture1 = value; } 354 set { m_TerrainTexture1 = value; }
355 } 355 }
356 356
357 private LLUUID m_TerrainTexture2 = LLUUID.Zero; 357 private LLUUID m_TerrainTexture2 = LLUUID.Zero;
358 358
359 public LLUUID TerrainTexture2 359 public LLUUID TerrainTexture2
360 { 360 {
361 get { return m_TerrainTexture2; } 361 get { return m_TerrainTexture2; }
362 set { m_TerrainTexture2 = value; } 362 set { m_TerrainTexture2 = value; }
363 } 363 }
364 364
365 private LLUUID m_TerrainTexture3 = LLUUID.Zero; 365 private LLUUID m_TerrainTexture3 = LLUUID.Zero;
366 366
367 public LLUUID TerrainTexture3 367 public LLUUID TerrainTexture3
368 { 368 {
369 get { return m_TerrainTexture3; } 369 get { return m_TerrainTexture3; }
370 set { m_TerrainTexture3 = value; } 370 set { m_TerrainTexture3 = value; }
371 } 371 }
372 372
373 private LLUUID m_TerrainTexture4 = LLUUID.Zero; 373 private LLUUID m_TerrainTexture4 = LLUUID.Zero;
374 374
375 public LLUUID TerrainTexture4 375 public LLUUID TerrainTexture4
376 { 376 {
377 get { return m_TerrainTexture4; } 377 get { return m_TerrainTexture4; }
378 set { m_TerrainTexture4 = value; } 378 set { m_TerrainTexture4 = value; }
379 } 379 }
380 380
381 private double m_Elevation1NW = 10; 381 private double m_Elevation1NW = 10;
382 382
383 public double Elevation1NW 383 public double Elevation1NW
384 { 384 {
385 get { return m_Elevation1NW; } 385 get { return m_Elevation1NW; }
386 set { m_Elevation1NW = value; } 386 set { m_Elevation1NW = value; }
387 } 387 }
388 388
389 private double m_Elevation2NW = 60; 389 private double m_Elevation2NW = 60;
390 390
391 public double Elevation2NW 391 public double Elevation2NW
392 { 392 {
393 get { return m_Elevation2NW; } 393 get { return m_Elevation2NW; }
394 set { m_Elevation2NW = value; } 394 set { m_Elevation2NW = value; }
395 } 395 }
396 396
397 private double m_Elevation1NE = 10; 397 private double m_Elevation1NE = 10;
398 398
399 public double Elevation1NE 399 public double Elevation1NE
400 { 400 {
401 get { return m_Elevation1NE; } 401 get { return m_Elevation1NE; }
402 set { m_Elevation1NE = value; } 402 set { m_Elevation1NE = value; }
403 } 403 }
404 404
405 private double m_Elevation2NE = 60; 405 private double m_Elevation2NE = 60;
406 406
407 public double Elevation2NE 407 public double Elevation2NE
408 { 408 {
409 get { return m_Elevation2NE; } 409 get { return m_Elevation2NE; }
410 set { m_Elevation2NE = value; } 410 set { m_Elevation2NE = value; }
411 } 411 }
412 412
413 private double m_Elevation1SE = 10; 413 private double m_Elevation1SE = 10;
414 414
415 public double Elevation1SE 415 public double Elevation1SE
416 { 416 {
417 get { return m_Elevation1SE; } 417 get { return m_Elevation1SE; }
418 set { m_Elevation1SE = value; } 418 set { m_Elevation1SE = value; }
419 } 419 }
420 420
421 private double m_Elevation2SE = 60; 421 private double m_Elevation2SE = 60;
422 422
423 public double Elevation2SE 423 public double Elevation2SE
424 { 424 {
425 get { return m_Elevation2SE; } 425 get { return m_Elevation2SE; }
426 set { m_Elevation2SE = value; } 426 set { m_Elevation2SE = value; }
427 } 427 }
428 428
429 private double m_Elevation1SW = 10; 429 private double m_Elevation1SW = 10;
430 430
431 public double Elevation1SW 431 public double Elevation1SW
432 { 432 {
433 get { return m_Elevation1SW; } 433 get { return m_Elevation1SW; }
434 set { m_Elevation1SW = value; } 434 set { m_Elevation1SW = value; }
435 } 435 }
436 436
437 private double m_Elevation2SW = 60; 437 private double m_Elevation2SW = 60;
438 438
439 public double Elevation2SW 439 public double Elevation2SW
440 { 440 {
441 get { return m_Elevation2SW; } 441 get { return m_Elevation2SW; }
442 set { m_Elevation2SW = value; } 442 set { m_Elevation2SW = value; }
443 } 443 }
444 444
445 private double m_WaterHeight = 20; 445 private double m_WaterHeight = 20;
446 446
447 public double WaterHeight 447 public double WaterHeight
448 { 448 {
449 get { return m_WaterHeight; } 449 get { return m_WaterHeight; }
450 set { m_WaterHeight = value; } 450 set { m_WaterHeight = value; }
451 } 451 }
452 452
453 private double m_TerrainRaiseLimit = 100; 453 private double m_TerrainRaiseLimit = 100;
454 454
455 public double TerrainRaiseLimit 455 public double TerrainRaiseLimit
456 { 456 {
457 get { return m_TerrainRaiseLimit; } 457 get { return m_TerrainRaiseLimit; }
458 set { m_TerrainRaiseLimit = value; } 458 set { m_TerrainRaiseLimit = value; }
459 } 459 }
460 460
461 private double m_TerrainLowerLimit = 100; 461 private double m_TerrainLowerLimit = 100;
462 462
463 public double TerrainLowerLimit 463 public double TerrainLowerLimit
464 { 464 {
465 get { return m_TerrainLowerLimit; } 465 get { return m_TerrainLowerLimit; }
466 set { m_TerrainLowerLimit = value; } 466 set { m_TerrainLowerLimit = value; }
467 } 467 }
468 468
469 private bool m_UseEstateSun = true; 469 private bool m_UseEstateSun = true;
470 470
471 public bool UseEstateSun 471 public bool UseEstateSun
472 { 472 {
473 get { return m_UseEstateSun; } 473 get { return m_UseEstateSun; }
474 set { m_UseEstateSun = value; } 474 set { m_UseEstateSun = value; }
475 } 475 }
476 476
477 private bool m_FixedSun = false; 477 private bool m_FixedSun = false;
478 478
479 public bool FixedSun 479 public bool FixedSun
480 { 480 {
481 get { return m_FixedSun; } 481 get { return m_FixedSun; }
482 set { m_FixedSun = value; } 482 set { m_FixedSun = value; }
483 } 483 }
484 484
485 private double m_SunPosition = 0.0; 485 private double m_SunPosition = 0.0;
486 486
487 public double SunPosition 487 public double SunPosition
488 { 488 {
489 get { return m_SunPosition; } 489 get { return m_SunPosition; }
490 set { m_SunPosition = value; } 490 set { m_SunPosition = value; }
491 } 491 }
492 492
493 private LLUUID m_Covenant = LLUUID.Zero; 493 private LLUUID m_Covenant = LLUUID.Zero;
494 494
495 public LLUUID Covenant 495 public LLUUID Covenant
496 { 496 {
497 get { return m_Covenant; } 497 get { return m_Covenant; }
498 set { m_Covenant = value; } 498 set { m_Covenant = value; }
499 } 499 }
500 } 500 }
501} 501}
diff --git a/OpenSim/Framework/Servers/OSHttpRequestPump.cs b/OpenSim/Framework/Servers/OSHttpRequestPump.cs
index 44fba47..78bd1e1 100644
--- a/OpenSim/Framework/Servers/OSHttpRequestPump.cs
+++ b/OpenSim/Framework/Servers/OSHttpRequestPump.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.Servers
116 // we are either out of handlers or get back a 116 // we are either out of handlers or get back a
117 // Handled or Detached 117 // Handled or Detached
118 OSHttpHandlerResult rc = OSHttpHandlerResult.Unprocessed; 118 OSHttpHandlerResult rc = OSHttpHandlerResult.Unprocessed;
119 foreach(OSHttpHandler h in handlers) 119 foreach (OSHttpHandler h in handlers)
120 { 120 {
121 rc = h.Process(req); 121 rc = h.Process(req);
122 122