aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs50
2 files changed, 29 insertions, 29 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
index c841a69..590a6a9 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4using Mono.Addins; 4using Mono.Addins;
5 5
6// General Information about an assembly is controlled through the following 6// General Information about an assembly is controlled through the following
7// set of attributes. Change these attribute values to modify the information 7// set of attributes. Change these attribute values to modify the information
8// associated with an assembly. 8// associated with an assembly.
9[assembly: AssemblyTitle("OpenSim.ApplicationPlugins.RemoteController")] 9[assembly: AssemblyTitle("OpenSim.ApplicationPlugins.RemoteController")]
@@ -15,8 +15,8 @@ using Mono.Addins;
15[assembly: AssemblyTrademark("")] 15[assembly: AssemblyTrademark("")]
16[assembly: AssemblyCulture("")] 16[assembly: AssemblyCulture("")]
17 17
18// Setting ComVisible to false makes the types in this assembly not visible 18// Setting ComVisible to false makes the types in this assembly not visible
19// to COM components. If you need to access a type in this assembly from 19// to COM components. If you need to access a type in this assembly from
20// COM, set the ComVisible attribute to true on that type. 20// COM, set the ComVisible attribute to true on that type.
21[assembly: ComVisible(false)] 21[assembly: ComVisible(false)]
22 22
@@ -26,7 +26,7 @@ using Mono.Addins;
26// Version information for an assembly consists of the following four values: 26// Version information for an assembly consists of the following four values:
27// 27//
28// Major Version 28// Major Version
29// Minor Version 29// Minor Version
30// Build Number 30// Build Number
31// Revision 31// Revision
32// 32//
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 1a7c698..a5c9fb4 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -575,7 +575,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
575 } 575 }
576 576
577 responseData["success"] = true; 577 responseData["success"] = true;
578 578
579 m_log.Info("[RADMIN]: Shutdown Administrator Request complete"); 579 m_log.Info("[RADMIN]: Shutdown Administrator Request complete");
580 } 580 }
581 581
@@ -747,9 +747,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
747 { 747 {
748 // No INI setting recorded. 748 // No INI setting recorded.
749 } 749 }
750 750
751 string regionIniPath; 751 string regionIniPath;
752 752
753 if (requestData.Contains("region_file")) 753 if (requestData.Contains("region_file"))
754 { 754 {
755 // Make sure that the file to be created is in a subdirectory of the region storage directory. 755 // Make sure that the file to be created is in a subdirectory of the region storage directory.
@@ -773,7 +773,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
773 region.RegionName.Replace(" ", "_").Replace(":", "_"). 773 region.RegionName.Replace(" ", "_").Replace(":", "_").
774 Replace("/", "_"))); 774 Replace("/", "_")));
775 } 775 }
776 776
777 m_log.DebugFormat("[RADMIN] CreateRegion: persisting region {0} to {1}", 777 m_log.DebugFormat("[RADMIN] CreateRegion: persisting region {0} to {1}",
778 region.RegionID, regionIniPath); 778 region.RegionID, regionIniPath);
779 region.SaveRegionToFile("dynamic region", regionIniPath); 779 region.SaveRegionToFile("dynamic region", regionIniPath);
@@ -782,9 +782,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
782 { 782 {
783 region.Persistent = false; 783 region.Persistent = false;
784 } 784 }
785 785
786 // Set the estate 786 // Set the estate
787 787
788 // Check for an existing estate 788 // Check for an existing estate
789 List<int> estateIDs = m_application.EstateDataService.GetEstates((string) requestData["estate_name"]); 789 List<int> estateIDs = m_application.EstateDataService.GetEstates((string) requestData["estate_name"]);
790 if (estateIDs.Count < 1) 790 if (estateIDs.Count < 1)
@@ -795,12 +795,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController
795 // ok, client wants us to use an explicit UUID 795 // ok, client wants us to use an explicit UUID
796 // regardless of what the avatar name provided 796 // regardless of what the avatar name provided
797 userID = new UUID((string) requestData["estate_owner_uuid"]); 797 userID = new UUID((string) requestData["estate_owner_uuid"]);
798 798
799 // Check that the specified user exists 799 // Check that the specified user exists
800 Scene currentOrFirst = m_application.SceneManager.CurrentOrFirstScene; 800 Scene currentOrFirst = m_application.SceneManager.CurrentOrFirstScene;
801 IUserAccountService accountService = currentOrFirst.UserAccountService; 801 IUserAccountService accountService = currentOrFirst.UserAccountService;
802 UserAccount user = accountService.GetUserAccount(currentOrFirst.RegionInfo.ScopeID, userID); 802 UserAccount user = accountService.GetUserAccount(currentOrFirst.RegionInfo.ScopeID, userID);
803 803
804 if (user == null) 804 if (user == null)
805 throw new Exception("Specified user was not found."); 805 throw new Exception("Specified user was not found.");
806 } 806 }
@@ -809,23 +809,23 @@ namespace OpenSim.ApplicationPlugins.RemoteController
809 // We need to look up the UUID for the avatar with the provided name. 809 // We need to look up the UUID for the avatar with the provided name.
810 string ownerFirst = (string) requestData["estate_owner_first"]; 810 string ownerFirst = (string) requestData["estate_owner_first"];
811 string ownerLast = (string) requestData["estate_owner_last"]; 811 string ownerLast = (string) requestData["estate_owner_last"];
812 812
813 Scene currentOrFirst = m_application.SceneManager.CurrentOrFirstScene; 813 Scene currentOrFirst = m_application.SceneManager.CurrentOrFirstScene;
814 IUserAccountService accountService = currentOrFirst.UserAccountService; 814 IUserAccountService accountService = currentOrFirst.UserAccountService;
815 UserAccount user = accountService.GetUserAccount(currentOrFirst.RegionInfo.ScopeID, 815 UserAccount user = accountService.GetUserAccount(currentOrFirst.RegionInfo.ScopeID,
816 ownerFirst, ownerLast); 816 ownerFirst, ownerLast);
817 817
818 // Check that the specified user exists 818 // Check that the specified user exists
819 if (user == null) 819 if (user == null)
820 throw new Exception("Specified user was not found."); 820 throw new Exception("Specified user was not found.");
821 821
822 userID = user.PrincipalID; 822 userID = user.PrincipalID;
823 } 823 }
824 else 824 else
825 { 825 {
826 throw new Exception("Estate owner details not provided."); 826 throw new Exception("Estate owner details not provided.");
827 } 827 }
828 828
829 // Create a new estate with the name provided 829 // Create a new estate with the name provided
830 region.EstateSettings = m_application.EstateDataService.CreateNewEstate(); 830 region.EstateSettings = m_application.EstateDataService.CreateNewEstate();
831 831
@@ -852,7 +852,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
852 throw new Exception("Failed to join estate."); 852 throw new Exception("Failed to join estate.");
853 } 853 }
854 } 854 }
855 855
856 // Create the region and perform any initial initialization 856 // Create the region and perform any initial initialization
857 857
858 IScene newScene; 858 IScene newScene;
@@ -1159,7 +1159,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1159 1159
1160 // Set home position 1160 // Set home position
1161 1161
1162 GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 1162 GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
1163 (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation)); 1163 (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation));
1164 if (null == home) 1164 if (null == home)
1165 { 1165 {
@@ -1389,7 +1389,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1389 1389
1390 if ((null != regionXLocation) && (null != regionYLocation)) 1390 if ((null != regionXLocation) && (null != regionYLocation))
1391 { 1391 {
1392 GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 1392 GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
1393 (int)Util.RegionToWorldLoc((uint)regionXLocation), (int)Util.RegionToWorldLoc((uint)regionYLocation)); 1393 (int)Util.RegionToWorldLoc((uint)regionXLocation), (int)Util.RegionToWorldLoc((uint)regionYLocation));
1394 if (null == home) { 1394 if (null == home) {
1395 m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstName, lastName); 1395 m_log.WarnFormat("[RADMIN]: Unable to set home region for updated user account {0} {1}", firstName, lastName);
@@ -1416,7 +1416,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1416 1416
1417 throw e; 1417 throw e;
1418 } 1418 }
1419 1419
1420 m_log.Info("[RADMIN]: UpdateUserAccount: request complete"); 1420 m_log.Info("[RADMIN]: UpdateUserAccount: request complete");
1421 } 1421 }
1422 } 1422 }
@@ -1608,7 +1608,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1608 GetSceneFromRegionParams(requestData, responseData, out scene); 1608 GetSceneFromRegionParams(requestData, responseData, out scene);
1609 1609
1610 string filename = (string) requestData["filename"]; 1610 string filename = (string) requestData["filename"];
1611 1611
1612 bool mergeOar = false; 1612 bool mergeOar = false;
1613 bool skipAssets = false; 1613 bool skipAssets = false;
1614 1614
@@ -1735,7 +1735,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1735 scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted; 1735 scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted;
1736 1736
1737 m_log.InfoFormat( 1737 m_log.InfoFormat(
1738 "[RADMIN]: Submitting save OAR request for {0} to file {1}, request ID {2}", 1738 "[RADMIN]: Submitting save OAR request for {0} to file {1}, request ID {2}",
1739 scene.Name, filename, requestId); 1739 scene.Name, filename, requestId);
1740 1740
1741 archiver.ArchiveRegion(filename, requestId, options); 1741 archiver.ArchiveRegion(filename, requestId, options);
@@ -2082,8 +2082,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2082 Hashtable responseData = (Hashtable)response.Value; 2082 Hashtable responseData = (Hashtable)response.Value;
2083// Hashtable requestData = (Hashtable)request.Params[0]; 2083// Hashtable requestData = (Hashtable)request.Params[0];
2084 2084
2085 m_application.SceneManager.ForEachScene(s => 2085 m_application.SceneManager.ForEachScene(s =>
2086 s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false) 2086 s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false)
2087 ); 2087 );
2088 2088
2089 responseData["success"] = true; 2089 responseData["success"] = true;
@@ -2815,7 +2815,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2815 if (destinationFolder.Type != (short)FolderType.Clothing) 2815 if (destinationFolder.Type != (short)FolderType.Clothing)
2816 { 2816 {
2817 destinationFolder = new InventoryFolderBase(); 2817 destinationFolder = new InventoryFolderBase();
2818 2818
2819 destinationFolder.ID = UUID.Random(); 2819 destinationFolder.ID = UUID.Random();
2820 destinationFolder.Name = "Clothing"; 2820 destinationFolder.Name = "Clothing";
2821 destinationFolder.Owner = destination; 2821 destinationFolder.Owner = destination;
@@ -2951,11 +2951,11 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2951 { 2951 {
2952 sourceFolder = new InventoryFolderBase(); 2952 sourceFolder = new InventoryFolderBase();
2953 sourceFolder.ID = UUID.Random(); 2953 sourceFolder.ID = UUID.Random();
2954 if (assetType == FolderType.Clothing) 2954 if (assetType == FolderType.Clothing)
2955 { 2955 {
2956 sourceFolder.Name = "Clothing"; 2956 sourceFolder.Name = "Clothing";
2957 } 2957 }
2958 else 2958 else
2959 { 2959 {
2960 sourceFolder.Name = "Body Parts"; 2960 sourceFolder.Name = "Body Parts";
2961 } 2961 }
@@ -3168,7 +3168,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
3168 3168
3169 // Set home position 3169 // Set home position
3170 3170
3171 GridRegion home = scene.GridService.GetRegionByPosition(scopeID, 3171 GridRegion home = scene.GridService.GetRegionByPosition(scopeID,
3172 (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation)); 3172 (int)Util.RegionToWorldLoc(regionXLocation), (int)Util.RegionToWorldLoc(regionYLocation));
3173 if (null == home) { 3173 if (null == home) {
3174 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", names[0], names[1]); 3174 m_log.WarnFormat("[RADMIN]: Unable to set home region for newly created user account {0} {1}", names[0], names[1]);