diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 10 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs | 54 |
2 files changed, 32 insertions, 32 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 1c924c0..6ffb8ec 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -206,7 +206,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
206 | throw new Exception("wrong password"); | 206 | throw new Exception("wrong password"); |
207 | 207 | ||
208 | string file = (string)requestData["filename"]; | 208 | string file = (string)requestData["filename"]; |
209 | UUID regionID = (string) requestData["regionid"]; | 209 | UUID regionID = (UUID)(string) requestData["regionid"]; |
210 | m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file); | 210 | m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file); |
211 | 211 | ||
212 | responseData["accepted"] = "true"; | 212 | responseData["accepted"] = "true"; |
@@ -389,7 +389,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
389 | if (requestData.ContainsKey("region_id") && | 389 | if (requestData.ContainsKey("region_id") && |
390 | !String.IsNullOrEmpty((string)requestData["region_id"])) | 390 | !String.IsNullOrEmpty((string)requestData["region_id"])) |
391 | { | 391 | { |
392 | regionID = (string)requestData["region_id"]; | 392 | regionID = (UUID)(string)requestData["region_id"]; |
393 | if (m_app.SceneManager.TryGetScene(regionID, out scene)) | 393 | if (m_app.SceneManager.TryGetScene(regionID, out scene)) |
394 | throw new Exception(String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>", | 394 | throw new Exception(String.Format("region UUID already in use by region {0}, UUID {1}, <{2},{3}>", |
395 | scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, | 395 | scene.RegionInfo.RegionName, scene.RegionInfo.RegionID, |
@@ -810,7 +810,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
810 | Scene scene = null; | 810 | Scene scene = null; |
811 | if (requestData.Contains("region_uuid")) | 811 | if (requestData.Contains("region_uuid")) |
812 | { | 812 | { |
813 | UUID region_uuid = (string)requestData["region_uuid"]; | 813 | UUID region_uuid = (UUID)(string)requestData["region_uuid"]; |
814 | if (!m_app.SceneManager.TryGetScene(region_uuid, out scene)) | 814 | if (!m_app.SceneManager.TryGetScene(region_uuid, out scene)) |
815 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 815 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
816 | } | 816 | } |
@@ -870,7 +870,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
870 | string filename = (string)requestData["filename"]; | 870 | string filename = (string)requestData["filename"]; |
871 | if (requestData.Contains("region_uuid")) | 871 | if (requestData.Contains("region_uuid")) |
872 | { | 872 | { |
873 | UUID region_uuid = (string)requestData["region_uuid"]; | 873 | UUID region_uuid = (UUID)(string)requestData["region_uuid"]; |
874 | if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) | 874 | if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) |
875 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 875 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
876 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 876 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); |
@@ -951,7 +951,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
951 | string filename = (string)requestData["filename"]; | 951 | string filename = (string)requestData["filename"]; |
952 | if (requestData.Contains("region_uuid")) | 952 | if (requestData.Contains("region_uuid")) |
953 | { | 953 | { |
954 | UUID region_uuid = (string)requestData["region_uuid"]; | 954 | UUID region_uuid = (UUID)(string)requestData["region_uuid"]; |
955 | if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) | 955 | if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) |
956 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 956 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
957 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 957 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs index a6d5b01..11a749c 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs | |||
@@ -494,7 +494,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
494 | } | 494 | } |
495 | if (xml.MoveToAttribute("Owner")) | 495 | if (xml.MoveToAttribute("Owner")) |
496 | { | 496 | { |
497 | rdata.userAppearance.Owner = xml.Value; | 497 | rdata.userAppearance.Owner = (UUID)xml.Value; |
498 | indata = true; | 498 | indata = true; |
499 | } | 499 | } |
500 | if (xml.MoveToAttribute("Serial")) | 500 | if (xml.MoveToAttribute("Serial")) |
@@ -506,156 +506,156 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
506 | case "Body" : | 506 | case "Body" : |
507 | if (xml.MoveToAttribute("Item")) | 507 | if (xml.MoveToAttribute("Item")) |
508 | { | 508 | { |
509 | rdata.userAppearance.BodyItem = xml.Value; | 509 | rdata.userAppearance.BodyItem = (UUID)xml.Value; |
510 | indata = true; | 510 | indata = true; |
511 | } | 511 | } |
512 | if (xml.MoveToAttribute("Asset")) | 512 | if (xml.MoveToAttribute("Asset")) |
513 | { | 513 | { |
514 | rdata.userAppearance.BodyAsset = xml.Value; | 514 | rdata.userAppearance.BodyAsset = (UUID)xml.Value; |
515 | indata = true; | 515 | indata = true; |
516 | } | 516 | } |
517 | break; | 517 | break; |
518 | case "Skin" : | 518 | case "Skin" : |
519 | if (xml.MoveToAttribute("Item")) | 519 | if (xml.MoveToAttribute("Item")) |
520 | { | 520 | { |
521 | rdata.userAppearance.SkinItem = xml.Value; | 521 | rdata.userAppearance.SkinItem = (UUID)xml.Value; |
522 | indata = true; | 522 | indata = true; |
523 | } | 523 | } |
524 | if (xml.MoveToAttribute("Asset")) | 524 | if (xml.MoveToAttribute("Asset")) |
525 | { | 525 | { |
526 | rdata.userAppearance.SkinAsset = xml.Value; | 526 | rdata.userAppearance.SkinAsset = (UUID)xml.Value; |
527 | indata = true; | 527 | indata = true; |
528 | } | 528 | } |
529 | break; | 529 | break; |
530 | case "Hair" : | 530 | case "Hair" : |
531 | if (xml.MoveToAttribute("Item")) | 531 | if (xml.MoveToAttribute("Item")) |
532 | { | 532 | { |
533 | rdata.userAppearance.HairItem = xml.Value; | 533 | rdata.userAppearance.HairItem = (UUID)xml.Value; |
534 | indata = true; | 534 | indata = true; |
535 | } | 535 | } |
536 | if (xml.MoveToAttribute("Asset")) | 536 | if (xml.MoveToAttribute("Asset")) |
537 | { | 537 | { |
538 | rdata.userAppearance.HairAsset = xml.Value; | 538 | rdata.userAppearance.HairAsset = (UUID)xml.Value; |
539 | indata = true; | 539 | indata = true; |
540 | } | 540 | } |
541 | break; | 541 | break; |
542 | case "Eyes" : | 542 | case "Eyes" : |
543 | if (xml.MoveToAttribute("Item")) | 543 | if (xml.MoveToAttribute("Item")) |
544 | { | 544 | { |
545 | rdata.userAppearance.EyesItem = xml.Value; | 545 | rdata.userAppearance.EyesItem = (UUID)xml.Value; |
546 | indata = true; | 546 | indata = true; |
547 | } | 547 | } |
548 | if (xml.MoveToAttribute("Asset")) | 548 | if (xml.MoveToAttribute("Asset")) |
549 | { | 549 | { |
550 | rdata.userAppearance.EyesAsset = xml.Value; | 550 | rdata.userAppearance.EyesAsset = (UUID)xml.Value; |
551 | indata = true; | 551 | indata = true; |
552 | } | 552 | } |
553 | break; | 553 | break; |
554 | case "Shirt" : | 554 | case "Shirt" : |
555 | if (xml.MoveToAttribute("Item")) | 555 | if (xml.MoveToAttribute("Item")) |
556 | { | 556 | { |
557 | rdata.userAppearance.ShirtItem = xml.Value; | 557 | rdata.userAppearance.ShirtItem = (UUID)xml.Value; |
558 | indata = true; | 558 | indata = true; |
559 | } | 559 | } |
560 | if (xml.MoveToAttribute("Asset")) | 560 | if (xml.MoveToAttribute("Asset")) |
561 | { | 561 | { |
562 | rdata.userAppearance.ShirtAsset = xml.Value; | 562 | rdata.userAppearance.ShirtAsset = (UUID)xml.Value; |
563 | indata = true; | 563 | indata = true; |
564 | } | 564 | } |
565 | break; | 565 | break; |
566 | case "Pants" : | 566 | case "Pants" : |
567 | if (xml.MoveToAttribute("Item")) | 567 | if (xml.MoveToAttribute("Item")) |
568 | { | 568 | { |
569 | rdata.userAppearance.PantsItem = xml.Value; | 569 | rdata.userAppearance.PantsItem = (UUID)xml.Value; |
570 | indata = true; | 570 | indata = true; |
571 | } | 571 | } |
572 | if (xml.MoveToAttribute("Asset")) | 572 | if (xml.MoveToAttribute("Asset")) |
573 | { | 573 | { |
574 | rdata.userAppearance.PantsAsset = xml.Value; | 574 | rdata.userAppearance.PantsAsset = (UUID)xml.Value; |
575 | indata = true; | 575 | indata = true; |
576 | } | 576 | } |
577 | break; | 577 | break; |
578 | case "Shoes" : | 578 | case "Shoes" : |
579 | if (xml.MoveToAttribute("Item")) | 579 | if (xml.MoveToAttribute("Item")) |
580 | { | 580 | { |
581 | rdata.userAppearance.ShoesItem = xml.Value; | 581 | rdata.userAppearance.ShoesItem = (UUID)xml.Value; |
582 | indata = true; | 582 | indata = true; |
583 | } | 583 | } |
584 | if (xml.MoveToAttribute("Asset")) | 584 | if (xml.MoveToAttribute("Asset")) |
585 | { | 585 | { |
586 | rdata.userAppearance.ShoesAsset = xml.Value; | 586 | rdata.userAppearance.ShoesAsset = (UUID)xml.Value; |
587 | indata = true; | 587 | indata = true; |
588 | } | 588 | } |
589 | break; | 589 | break; |
590 | case "Socks" : | 590 | case "Socks" : |
591 | if (xml.MoveToAttribute("Item")) | 591 | if (xml.MoveToAttribute("Item")) |
592 | { | 592 | { |
593 | rdata.userAppearance.SocksItem = xml.Value; | 593 | rdata.userAppearance.SocksItem = (UUID)xml.Value; |
594 | indata = true; | 594 | indata = true; |
595 | } | 595 | } |
596 | if (xml.MoveToAttribute("Asset")) | 596 | if (xml.MoveToAttribute("Asset")) |
597 | { | 597 | { |
598 | rdata.userAppearance.SocksAsset = xml.Value; | 598 | rdata.userAppearance.SocksAsset = (UUID)xml.Value; |
599 | indata = true; | 599 | indata = true; |
600 | } | 600 | } |
601 | break; | 601 | break; |
602 | case "Jacket" : | 602 | case "Jacket" : |
603 | if (xml.MoveToAttribute("Item")) | 603 | if (xml.MoveToAttribute("Item")) |
604 | { | 604 | { |
605 | rdata.userAppearance.JacketItem = xml.Value; | 605 | rdata.userAppearance.JacketItem = (UUID)xml.Value; |
606 | indata = true; | 606 | indata = true; |
607 | } | 607 | } |
608 | if (xml.MoveToAttribute("Asset")) | 608 | if (xml.MoveToAttribute("Asset")) |
609 | { | 609 | { |
610 | rdata.userAppearance.JacketAsset = xml.Value; | 610 | rdata.userAppearance.JacketAsset = (UUID)xml.Value; |
611 | indata = true; | 611 | indata = true; |
612 | } | 612 | } |
613 | break; | 613 | break; |
614 | case "Gloves" : | 614 | case "Gloves" : |
615 | if (xml.MoveToAttribute("Item")) | 615 | if (xml.MoveToAttribute("Item")) |
616 | { | 616 | { |
617 | rdata.userAppearance.GlovesItem = xml.Value; | 617 | rdata.userAppearance.GlovesItem = (UUID)xml.Value; |
618 | indata = true; | 618 | indata = true; |
619 | } | 619 | } |
620 | if (xml.MoveToAttribute("Asset")) | 620 | if (xml.MoveToAttribute("Asset")) |
621 | { | 621 | { |
622 | rdata.userAppearance.GlovesAsset = xml.Value; | 622 | rdata.userAppearance.GlovesAsset = (UUID)xml.Value; |
623 | indata = true; | 623 | indata = true; |
624 | } | 624 | } |
625 | break; | 625 | break; |
626 | case "UnderShirt" : | 626 | case "UnderShirt" : |
627 | if (xml.MoveToAttribute("Item")) | 627 | if (xml.MoveToAttribute("Item")) |
628 | { | 628 | { |
629 | rdata.userAppearance.UnderShirtItem = xml.Value; | 629 | rdata.userAppearance.UnderShirtItem = (UUID)xml.Value; |
630 | indata = true; | 630 | indata = true; |
631 | } | 631 | } |
632 | if (xml.MoveToAttribute("Asset")) | 632 | if (xml.MoveToAttribute("Asset")) |
633 | { | 633 | { |
634 | rdata.userAppearance.UnderShirtAsset = xml.Value; | 634 | rdata.userAppearance.UnderShirtAsset = (UUID)xml.Value; |
635 | indata = true; | 635 | indata = true; |
636 | } | 636 | } |
637 | break; | 637 | break; |
638 | case "UnderPants" : | 638 | case "UnderPants" : |
639 | if (xml.MoveToAttribute("Item")) | 639 | if (xml.MoveToAttribute("Item")) |
640 | { | 640 | { |
641 | rdata.userAppearance.UnderPantsItem = xml.Value; | 641 | rdata.userAppearance.UnderPantsItem = (UUID)xml.Value; |
642 | indata = true; | 642 | indata = true; |
643 | } | 643 | } |
644 | if (xml.MoveToAttribute("Asset")) | 644 | if (xml.MoveToAttribute("Asset")) |
645 | { | 645 | { |
646 | rdata.userAppearance.UnderPantsAsset = xml.Value; | 646 | rdata.userAppearance.UnderPantsAsset = (UUID)xml.Value; |
647 | indata = true; | 647 | indata = true; |
648 | } | 648 | } |
649 | break; | 649 | break; |
650 | case "Skirt" : | 650 | case "Skirt" : |
651 | if (xml.MoveToAttribute("Item")) | 651 | if (xml.MoveToAttribute("Item")) |
652 | { | 652 | { |
653 | rdata.userAppearance.SkirtItem = xml.Value; | 653 | rdata.userAppearance.SkirtItem = (UUID)xml.Value; |
654 | indata = true; | 654 | indata = true; |
655 | } | 655 | } |
656 | if (xml.MoveToAttribute("Asset")) | 656 | if (xml.MoveToAttribute("Asset")) |
657 | { | 657 | { |
658 | rdata.userAppearance.SkirtAsset = xml.Value; | 658 | rdata.userAppearance.SkirtAsset = (UUID)xml.Value; |
659 | indata = true; | 659 | indata = true; |
660 | } | 660 | } |
661 | break; | 661 | break; |