diff options
author | Justin Clark-Casey (justincc) | 2011-04-15 23:54:30 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-15 23:54:30 +0100 |
commit | ed74be65995afe192ce03177325c98b0100ab157 (patch) | |
tree | 732a36c25a98172578064b7ec204833c087e43c5 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |
parent | refactor: separate out code that adds permissions (diff) | |
download | opensim-SC-ed74be65995afe192ce03177325c98b0100ab157.zip opensim-SC-ed74be65995afe192ce03177325c98b0100ab157.tar.gz opensim-SC-ed74be65995afe192ce03177325c98b0100ab157.tar.bz2 opensim-SC-ed74be65995afe192ce03177325c98b0100ab157.tar.xz |
Make remote admin error messages more helpful on windows.
Also, make log messages conform more with convention.
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 161 |
1 files changed, 73 insertions, 88 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index c6b34f9..dc4309f 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
94 | 94 | ||
95 | public void Initialise() | 95 | public void Initialise() |
96 | { | 96 | { |
97 | m_log.Info("[RADMIN]: " + Name + " cannot be default-initialized!"); | 97 | m_log.Error("[RADMIN]: " + Name + " cannot be default-initialized!"); |
98 | throw new PluginNotInitialisedException(Name); | 98 | throw new PluginNotInitialisedException(Name); |
99 | } | 99 | } |
100 | 100 | ||
@@ -111,7 +111,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
111 | else | 111 | else |
112 | { | 112 | { |
113 | m_config = m_configSource.Configs["RemoteAdmin"]; | 113 | m_config = m_configSource.Configs["RemoteAdmin"]; |
114 | m_log.Info("[RADMIN]: Remote Admin Plugin Enabled"); | 114 | m_log.Debug("[RADMIN]: Remote Admin Plugin Enabled"); |
115 | m_requiredPassword = m_config.GetString("access_password", String.Empty); | 115 | m_requiredPassword = m_config.GetString("access_password", String.Empty); |
116 | int port = m_config.GetInt("port", 0); | 116 | int port = m_config.GetInt("port", 0); |
117 | 117 | ||
@@ -230,8 +230,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
230 | } | 230 | } |
231 | catch (Exception e) | 231 | catch (Exception e) |
232 | { | 232 | { |
233 | m_log.ErrorFormat("[RADMIN]: Restart region: failed: {0}", e.Message); | 233 | m_log.ErrorFormat("[RADMIN]: Restart region: failed: {0} {1}", e.Message, e.StackTrace); |
234 | m_log.DebugFormat("[RADMIN]: Restart region: failed: {0}", e.ToString()); | ||
235 | responseData["accepted"] = false; | 234 | responseData["accepted"] = false; |
236 | responseData["success"] = false; | 235 | responseData["success"] = false; |
237 | responseData["rebooting"] = false; | 236 | responseData["rebooting"] = false; |
@@ -277,8 +276,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
277 | } | 276 | } |
278 | catch (Exception e) | 277 | catch (Exception e) |
279 | { | 278 | { |
280 | m_log.ErrorFormat("[RADMIN]: Broadcasting: failed: {0}", e.Message); | 279 | m_log.ErrorFormat("[RADMIN]: Broadcasting: failed: {0}", e.Message, e.StackTrace); |
281 | m_log.DebugFormat("[RADMIN]: Broadcasting: failed: {0}", e.ToString()); | ||
282 | 280 | ||
283 | responseData["accepted"] = false; | 281 | responseData["accepted"] = false; |
284 | responseData["success"] = false; | 282 | responseData["success"] = false; |
@@ -301,7 +299,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
301 | { | 299 | { |
302 | Hashtable requestData = (Hashtable) request.Params[0]; | 300 | Hashtable requestData = (Hashtable) request.Params[0]; |
303 | 301 | ||
304 | m_log.DebugFormat("[RADMIN]: Load Terrain: XmlRpc {0}", request.ToString()); | 302 | m_log.DebugFormat("[RADMIN]: Load Terrain: XmlRpc {0}", request); |
305 | // foreach (string k in requestData.Keys) | 303 | // foreach (string k in requestData.Keys) |
306 | // { | 304 | // { |
307 | // m_log.DebugFormat("[RADMIN]: Load Terrain: XmlRpc {0}: >{1}< {2}", | 305 | // m_log.DebugFormat("[RADMIN]: Load Terrain: XmlRpc {0}: >{1}< {2}", |
@@ -348,8 +346,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
348 | } | 346 | } |
349 | catch (Exception e) | 347 | catch (Exception e) |
350 | { | 348 | { |
351 | m_log.ErrorFormat("[RADMIN]: Terrain Loading: failed: {0}", e.Message); | 349 | m_log.ErrorFormat("[RADMIN]: Terrain Loading: failed: {0} {1}", e.Message, e.StackTrace); |
352 | m_log.DebugFormat("[RADMIN]: Terrain Loading: failed: {0}", e.ToString()); | ||
353 | 350 | ||
354 | responseData["success"] = false; | 351 | responseData["success"] = false; |
355 | responseData["error"] = e.Message; | 352 | responseData["error"] = e.Message; |
@@ -417,14 +414,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
417 | } | 414 | } |
418 | catch (Exception e) | 415 | catch (Exception e) |
419 | { | 416 | { |
420 | m_log.ErrorFormat("[RADMIN] Shutdown: failed: {0}", e.Message); | 417 | m_log.ErrorFormat("[RADMIN]: Shutdown: failed: {0} {1}", e.Message, e.StackTrace); |
421 | m_log.DebugFormat("[RADMIN] Shutdown: failed: {0}", e.ToString()); | ||
422 | 418 | ||
423 | responseData["accepted"] = false; | 419 | responseData["accepted"] = false; |
424 | responseData["error"] = e.Message; | 420 | responseData["error"] = e.Message; |
425 | 421 | ||
426 | response.Value = responseData; | 422 | response.Value = responseData; |
427 | } | 423 | } |
424 | |||
428 | m_log.Info("[RADMIN]: Shutdown Administrator Request complete"); | 425 | m_log.Info("[RADMIN]: Shutdown Administrator Request complete"); |
429 | return response; | 426 | return response; |
430 | } | 427 | } |
@@ -725,8 +722,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
725 | } | 722 | } |
726 | catch (Exception e) | 723 | catch (Exception e) |
727 | { | 724 | { |
728 | m_log.ErrorFormat("[RADMIN] CreateRegion: failed {0}", e.Message); | 725 | m_log.ErrorFormat("[RADMIN] CreateRegion: failed {0} {1}", e.Message, e.StackTrace); |
729 | m_log.DebugFormat("[RADMIN] CreateRegion: failed {0}", e.ToString()); | ||
730 | 726 | ||
731 | responseData["success"] = false; | 727 | responseData["success"] = false; |
732 | responseData["error"] = e.Message; | 728 | responseData["error"] = e.Message; |
@@ -792,8 +788,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
792 | } | 788 | } |
793 | catch (Exception e) | 789 | catch (Exception e) |
794 | { | 790 | { |
795 | m_log.ErrorFormat("[RADMIN] DeleteRegion: failed {0}", e.Message); | 791 | m_log.ErrorFormat("[RADMIN] DeleteRegion: failed {0} {1}", e.Message, e.StackTrace); |
796 | m_log.DebugFormat("[RADMIN] DeleteRegion: failed {0}", e.ToString()); | ||
797 | 792 | ||
798 | responseData["success"] = false; | 793 | responseData["success"] = false; |
799 | responseData["error"] = e.Message; | 794 | responseData["error"] = e.Message; |
@@ -884,8 +879,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
884 | } | 879 | } |
885 | catch (Exception e) | 880 | catch (Exception e) |
886 | { | 881 | { |
887 | m_log.ErrorFormat("[RADMIN] CloseRegion: failed {0}", e.Message); | 882 | m_log.ErrorFormat("[RADMIN]: CloseRegion: failed {0} {1}", e.Message, e.StackTrace); |
888 | m_log.DebugFormat("[RADMIN] CloseRegion: failed {0}", e.ToString()); | ||
889 | 883 | ||
890 | responseData["success"] = false; | 884 | responseData["success"] = false; |
891 | responseData["error"] = e.Message; | 885 | responseData["error"] = e.Message; |
@@ -982,8 +976,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
982 | } | 976 | } |
983 | catch (Exception e) | 977 | catch (Exception e) |
984 | { | 978 | { |
985 | m_log.ErrorFormat("[RADMIN] ModifyRegion: failed {0}", e.Message); | 979 | m_log.ErrorFormat("[RADMIN] ModifyRegion: failed {0} {1}", e.Message, e.StackTrace); |
986 | m_log.DebugFormat("[RADMIN] ModifyRegion: failed {0}", e.ToString()); | ||
987 | 980 | ||
988 | responseData["success"] = false; | 981 | responseData["success"] = false; |
989 | responseData["error"] = e.Message; | 982 | responseData["error"] = e.Message; |
@@ -1106,8 +1099,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1106 | } | 1099 | } |
1107 | catch (Exception e) | 1100 | catch (Exception e) |
1108 | { | 1101 | { |
1109 | m_log.ErrorFormat("[RADMIN] CreateUser: failed: {0}", e.Message); | 1102 | m_log.ErrorFormat("[RADMIN]: CreateUser: failed: {0} {1}", e.Message, e.StackTrace); |
1110 | m_log.DebugFormat("[RADMIN] CreateUser: failed: {0}", e.ToString()); | ||
1111 | 1103 | ||
1112 | responseData["success"] = false; | 1104 | responseData["success"] = false; |
1113 | responseData["avatar_uuid"] = UUID.Zero.ToString(); | 1105 | responseData["avatar_uuid"] = UUID.Zero.ToString(); |
@@ -1198,8 +1190,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1198 | } | 1190 | } |
1199 | catch (Exception e) | 1191 | catch (Exception e) |
1200 | { | 1192 | { |
1201 | m_log.ErrorFormat("[RADMIN] UserExists: failed: {0}", e.Message); | 1193 | m_log.ErrorFormat("[RADMIN]: UserExists: failed: {0} {1}", e.Message, e.StackTrace); |
1202 | m_log.DebugFormat("[RADMIN] UserExists: failed: {0}", e.ToString()); | ||
1203 | 1194 | ||
1204 | responseData["success"] = false; | 1195 | responseData["success"] = false; |
1205 | responseData["error"] = e.Message; | 1196 | responseData["error"] = e.Message; |
@@ -1372,9 +1363,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1372 | } | 1363 | } |
1373 | catch (Exception e) | 1364 | catch (Exception e) |
1374 | { | 1365 | { |
1375 | 1366 | m_log.ErrorFormat("[RADMIN] UpdateUserAccount: failed: {0} {1}", e.Message, e.StackTrace); | |
1376 | m_log.ErrorFormat("[RADMIN] UpdateUserAccount: failed: {0}", e.Message); | ||
1377 | m_log.DebugFormat("[RADMIN] UpdateUserAccount: failed: {0}", e.ToString()); | ||
1378 | 1367 | ||
1379 | responseData["success"] = false; | 1368 | responseData["success"] = false; |
1380 | responseData["avatar_uuid"] = UUID.Zero.ToString(); | 1369 | responseData["avatar_uuid"] = UUID.Zero.ToString(); |
@@ -1382,6 +1371,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1382 | 1371 | ||
1383 | response.Value = responseData; | 1372 | response.Value = responseData; |
1384 | } | 1373 | } |
1374 | |||
1385 | m_log.Info("[RADMIN]: UpdateUserAccount: request complete"); | 1375 | m_log.Info("[RADMIN]: UpdateUserAccount: request complete"); |
1386 | return response; | 1376 | return response; |
1387 | } | 1377 | } |
@@ -1397,7 +1387,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1397 | 1387 | ||
1398 | private void UpdateUserAppearance(Hashtable responseData, Hashtable requestData, UUID userid) | 1388 | private void UpdateUserAppearance(Hashtable responseData, Hashtable requestData, UUID userid) |
1399 | { | 1389 | { |
1400 | m_log.DebugFormat("[RADMIN] updateUserAppearance"); | 1390 | m_log.DebugFormat("[RADMIN]: updateUserAppearance"); |
1401 | 1391 | ||
1402 | string defaultMale = m_config.GetString("default_male", "Default Male"); | 1392 | string defaultMale = m_config.GetString("default_male", "Default Male"); |
1403 | string defaultFemale = m_config.GetString("default_female", "Default Female"); | 1393 | string defaultFemale = m_config.GetString("default_female", "Default Female"); |
@@ -1437,16 +1427,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1437 | 1427 | ||
1438 | if (String.IsNullOrEmpty(model)) | 1428 | if (String.IsNullOrEmpty(model)) |
1439 | { | 1429 | { |
1440 | m_log.DebugFormat("[RADMIN] Appearance update not requested"); | 1430 | m_log.DebugFormat("[RADMIN]: Appearance update not requested"); |
1441 | return; | 1431 | return; |
1442 | } | 1432 | } |
1443 | 1433 | ||
1444 | m_log.DebugFormat("[RADMIN] Setting appearance for avatar {0}, using model <{1}>", userid, model); | 1434 | m_log.DebugFormat("[RADMIN]: Setting appearance for avatar {0}, using model <{1}>", userid, model); |
1445 | 1435 | ||
1446 | string[] modelSpecifiers = model.Split(); | 1436 | string[] modelSpecifiers = model.Split(); |
1447 | if (modelSpecifiers.Length != 2) | 1437 | if (modelSpecifiers.Length != 2) |
1448 | { | 1438 | { |
1449 | m_log.WarnFormat("[RADMIN] User appearance not set for {0}. Invalid model name : <{1}>", userid, model); | 1439 | m_log.WarnFormat("[RADMIN]: User appearance not set for {0}. Invalid model name : <{1}>", userid, model); |
1450 | // modelSpecifiers = dmodel.Split(); | 1440 | // modelSpecifiers = dmodel.Split(); |
1451 | return; | 1441 | return; |
1452 | } | 1442 | } |
@@ -1457,7 +1447,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1457 | 1447 | ||
1458 | if (modelProfile == null) | 1448 | if (modelProfile == null) |
1459 | { | 1449 | { |
1460 | m_log.WarnFormat("[RADMIN] Requested model ({0}) not found. Appearance unchanged", model); | 1450 | m_log.WarnFormat("[RADMIN]: Requested model ({0}) not found. Appearance unchanged", model); |
1461 | return; | 1451 | return; |
1462 | } | 1452 | } |
1463 | 1453 | ||
@@ -1467,7 +1457,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1467 | 1457 | ||
1468 | EstablishAppearance(userid, modelProfile.PrincipalID); | 1458 | EstablishAppearance(userid, modelProfile.PrincipalID); |
1469 | 1459 | ||
1470 | m_log.DebugFormat("[RADMIN] Finished setting appearance for avatar {0}, using model {1}", | 1460 | m_log.DebugFormat("[RADMIN]: Finished setting appearance for avatar {0}, using model {1}", |
1471 | userid, model); | 1461 | userid, model); |
1472 | } | 1462 | } |
1473 | 1463 | ||
@@ -1479,7 +1469,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1479 | 1469 | ||
1480 | private void EstablishAppearance(UUID destination, UUID source) | 1470 | private void EstablishAppearance(UUID destination, UUID source) |
1481 | { | 1471 | { |
1482 | m_log.DebugFormat("[RADMIN] Initializing inventory for {0} from {1}", destination, source); | 1472 | m_log.DebugFormat("[RADMIN]: Initializing inventory for {0} from {1}", destination, source); |
1483 | Scene scene = m_application.SceneManager.CurrentOrFirstScene; | 1473 | Scene scene = m_application.SceneManager.CurrentOrFirstScene; |
1484 | 1474 | ||
1485 | // If the model has no associated appearance we're done. | 1475 | // If the model has no associated appearance we're done. |
@@ -1501,7 +1491,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1501 | } | 1491 | } |
1502 | catch (Exception e) | 1492 | catch (Exception e) |
1503 | { | 1493 | { |
1504 | m_log.WarnFormat("[RADMIN] Error transferring appearance for {0} : {1}", | 1494 | m_log.WarnFormat("[RADMIN]: Error transferring appearance for {0} : {1}", |
1505 | destination, e.Message); | 1495 | destination, e.Message); |
1506 | } | 1496 | } |
1507 | 1497 | ||
@@ -1532,7 +1522,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1532 | } | 1522 | } |
1533 | catch (Exception e) | 1523 | catch (Exception e) |
1534 | { | 1524 | { |
1535 | m_log.WarnFormat("[RADMIN] Error transferring appearance for {0} : {1}", | 1525 | m_log.WarnFormat("[RADMIN]: Error transferring appearance for {0} : {1}", |
1536 | destination, e.Message); | 1526 | destination, e.Message); |
1537 | } | 1527 | } |
1538 | 1528 | ||
@@ -1567,7 +1557,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1567 | destinationFolder.ParentID = inventoryService.GetRootFolder(destination).ID; | 1557 | destinationFolder.ParentID = inventoryService.GetRootFolder(destination).ID; |
1568 | destinationFolder.Version = 1; | 1558 | destinationFolder.Version = 1; |
1569 | inventoryService.AddFolder(destinationFolder); // store base record | 1559 | inventoryService.AddFolder(destinationFolder); // store base record |
1570 | m_log.ErrorFormat("[RADMIN] Created folder for destination {0}", source); | 1560 | m_log.ErrorFormat("[RADMIN]: Created folder for destination {0}", source); |
1571 | } | 1561 | } |
1572 | 1562 | ||
1573 | // Wearables | 1563 | // Wearables |
@@ -1730,7 +1720,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1730 | destinationFolder.ParentID = inventoryService.GetRootFolder(destination).ID; | 1720 | destinationFolder.ParentID = inventoryService.GetRootFolder(destination).ID; |
1731 | destinationFolder.Version = 1; | 1721 | destinationFolder.Version = 1; |
1732 | inventoryService.AddFolder(destinationFolder); // store base record | 1722 | inventoryService.AddFolder(destinationFolder); // store base record |
1733 | m_log.ErrorFormat("[RADMIN] Created folder for destination {0}", source); | 1723 | m_log.ErrorFormat("[RADMIN]: Created folder for destination {0}", source); |
1734 | } | 1724 | } |
1735 | 1725 | ||
1736 | InventoryFolderBase extraFolder; | 1726 | InventoryFolderBase extraFolder; |
@@ -1748,7 +1738,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1748 | extraFolder.ParentID = destinationFolder.ID; | 1738 | extraFolder.ParentID = destinationFolder.ID; |
1749 | inventoryService.AddFolder(extraFolder); | 1739 | inventoryService.AddFolder(extraFolder); |
1750 | 1740 | ||
1751 | m_log.DebugFormat("[RADMIN] Added folder {0} to folder {1}", extraFolder.ID, sourceFolder.ID); | 1741 | m_log.DebugFormat("[RADMIN]: Added folder {0} to folder {1}", extraFolder.ID, sourceFolder.ID); |
1752 | 1742 | ||
1753 | List<InventoryItemBase> items = inventoryService.GetFolderContent(source, folder.ID).Items; | 1743 | List<InventoryItemBase> items = inventoryService.GetFolderContent(source, folder.ID).Items; |
1754 | 1744 | ||
@@ -1825,7 +1815,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1825 | /// indicate which outfit is the default, and this outfit will be automatically worn. The | 1815 | /// indicate which outfit is the default, and this outfit will be automatically worn. The |
1826 | /// other outfits are provided to allow "real" avatars a way to easily change their outfits. | 1816 | /// other outfits are provided to allow "real" avatars a way to easily change their outfits. |
1827 | /// </summary> | 1817 | /// </summary> |
1828 | |||
1829 | private bool CreateDefaultAvatars() | 1818 | private bool CreateDefaultAvatars() |
1830 | { | 1819 | { |
1831 | // Only load once | 1820 | // Only load once |
@@ -1834,7 +1823,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1834 | return false; | 1823 | return false; |
1835 | } | 1824 | } |
1836 | 1825 | ||
1837 | m_log.DebugFormat("[RADMIN] Creating default avatar entries"); | 1826 | m_log.DebugFormat("[RADMIN]: Creating default avatar entries"); |
1838 | 1827 | ||
1839 | m_defaultAvatarsLoaded = true; | 1828 | m_defaultAvatarsLoaded = true; |
1840 | 1829 | ||
@@ -1890,7 +1879,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1890 | 1879 | ||
1891 | foreach (XmlElement avatar in avatars) | 1880 | foreach (XmlElement avatar in avatars) |
1892 | { | 1881 | { |
1893 | m_log.DebugFormat("[RADMIN] Loading appearance for {0}, gender = {1}", | 1882 | m_log.DebugFormat("[RADMIN]: Loading appearance for {0}, gender = {1}", |
1894 | GetStringAttribute(avatar,"name","?"), GetStringAttribute(avatar,"gender","?")); | 1883 | GetStringAttribute(avatar,"name","?"), GetStringAttribute(avatar,"gender","?")); |
1895 | 1884 | ||
1896 | // Create the user identified by the avatar entry | 1885 | // Create the user identified by the avatar entry |
@@ -1912,7 +1901,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1912 | account = CreateUser(scopeID, names[0], names[1], password, email); | 1901 | account = CreateUser(scopeID, names[0], names[1], password, email); |
1913 | if (null == account) | 1902 | if (null == account) |
1914 | { | 1903 | { |
1915 | m_log.ErrorFormat("[RADMIN] Avatar {0} {1} was not created", names[0], names[1]); | 1904 | m_log.ErrorFormat("[RADMIN]: Avatar {0} {1} was not created", names[0], names[1]); |
1916 | return false; | 1905 | return false; |
1917 | } | 1906 | } |
1918 | } | 1907 | } |
@@ -1930,12 +1919,12 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1930 | 1919 | ||
1931 | ID = account.PrincipalID; | 1920 | ID = account.PrincipalID; |
1932 | 1921 | ||
1933 | m_log.DebugFormat("[RADMIN] User {0}[{1}] created or retrieved", name, ID); | 1922 | m_log.DebugFormat("[RADMIN]: User {0}[{1}] created or retrieved", name, ID); |
1934 | include = true; | 1923 | include = true; |
1935 | } | 1924 | } |
1936 | catch (Exception e) | 1925 | catch (Exception e) |
1937 | { | 1926 | { |
1938 | m_log.DebugFormat("[RADMIN] Error creating user {0} : {1}", name, e.Message); | 1927 | m_log.DebugFormat("[RADMIN]: Error creating user {0} : {1}", name, e.Message); |
1939 | include = false; | 1928 | include = false; |
1940 | } | 1929 | } |
1941 | 1930 | ||
@@ -1975,7 +1964,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1975 | clothingFolder.ParentID = inventoryService.GetRootFolder(ID).ID; | 1964 | clothingFolder.ParentID = inventoryService.GetRootFolder(ID).ID; |
1976 | clothingFolder.Version = 1; | 1965 | clothingFolder.Version = 1; |
1977 | inventoryService.AddFolder(clothingFolder); // store base record | 1966 | inventoryService.AddFolder(clothingFolder); // store base record |
1978 | m_log.ErrorFormat("[RADMIN] Created clothing folder for {0}/{1}", name, ID); | 1967 | m_log.ErrorFormat("[RADMIN]: Created clothing folder for {0}/{1}", name, ID); |
1979 | } | 1968 | } |
1980 | 1969 | ||
1981 | // OK, now we have an inventory for the user, read in the outfits from the | 1970 | // OK, now we have an inventory for the user, read in the outfits from the |
@@ -1988,7 +1977,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1988 | 1977 | ||
1989 | foreach (XmlElement outfit in outfits) | 1978 | foreach (XmlElement outfit in outfits) |
1990 | { | 1979 | { |
1991 | m_log.DebugFormat("[RADMIN] Loading outfit {0} for {1}", | 1980 | m_log.DebugFormat("[RADMIN]: Loading outfit {0} for {1}", |
1992 | GetStringAttribute(outfit,"name","?"), GetStringAttribute(avatar,"name","?")); | 1981 | GetStringAttribute(outfit,"name","?"), GetStringAttribute(avatar,"name","?")); |
1993 | 1982 | ||
1994 | outfitName = GetStringAttribute(outfit,"name",""); | 1983 | outfitName = GetStringAttribute(outfit,"name",""); |
@@ -2012,7 +2001,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2012 | // Otherwise, we must create the folder. | 2001 | // Otherwise, we must create the folder. |
2013 | if (extraFolder == null) | 2002 | if (extraFolder == null) |
2014 | { | 2003 | { |
2015 | m_log.DebugFormat("[RADMIN] Creating outfit folder {0} for {1}", outfitName, name); | 2004 | m_log.DebugFormat("[RADMIN]: Creating outfit folder {0} for {1}", outfitName, name); |
2016 | extraFolder = new InventoryFolderBase(); | 2005 | extraFolder = new InventoryFolderBase(); |
2017 | extraFolder.ID = UUID.Random(); | 2006 | extraFolder.ID = UUID.Random(); |
2018 | extraFolder.Name = outfitName; | 2007 | extraFolder.Name = outfitName; |
@@ -2021,7 +2010,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2021 | extraFolder.Version = 1; | 2010 | extraFolder.Version = 1; |
2022 | extraFolder.ParentID = clothingFolder.ID; | 2011 | extraFolder.ParentID = clothingFolder.ID; |
2023 | inventoryService.AddFolder(extraFolder); | 2012 | inventoryService.AddFolder(extraFolder); |
2024 | m_log.DebugFormat("[RADMIN] Adding outfile folder {0} to folder {1}", extraFolder.ID, clothingFolder.ID); | 2013 | m_log.DebugFormat("[RADMIN]: Adding outfile folder {0} to folder {1}", extraFolder.ID, clothingFolder.ID); |
2025 | } | 2014 | } |
2026 | 2015 | ||
2027 | // Now get the pieces that make up the outfit | 2016 | // Now get the pieces that make up the outfit |
@@ -2036,7 +2025,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2036 | switch (child.Name) | 2025 | switch (child.Name) |
2037 | { | 2026 | { |
2038 | case "Permissions" : | 2027 | case "Permissions" : |
2039 | m_log.DebugFormat("[RADMIN] Permissions specified"); | 2028 | m_log.DebugFormat("[RADMIN]: Permissions specified"); |
2040 | perms = child; | 2029 | perms = child; |
2041 | break; | 2030 | break; |
2042 | case "Asset" : | 2031 | case "Asset" : |
@@ -2086,7 +2075,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2086 | inventoryItem.Folder = extraFolder.ID; // Parent folder | 2075 | inventoryItem.Folder = extraFolder.ID; // Parent folder |
2087 | 2076 | ||
2088 | m_application.SceneManager.CurrentOrFirstScene.AddInventoryItem(inventoryItem); | 2077 | m_application.SceneManager.CurrentOrFirstScene.AddInventoryItem(inventoryItem); |
2089 | m_log.DebugFormat("[RADMIN] Added item {0} to folder {1}", inventoryItem.ID, extraFolder.ID); | 2078 | m_log.DebugFormat("[RADMIN]: Added item {0} to folder {1}", inventoryItem.ID, extraFolder.ID); |
2090 | } | 2079 | } |
2091 | 2080 | ||
2092 | // Attach item, if attachpoint is specified | 2081 | // Attach item, if attachpoint is specified |
@@ -2094,7 +2083,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2094 | if (attachpoint != 0) | 2083 | if (attachpoint != 0) |
2095 | { | 2084 | { |
2096 | avatarAppearance.SetAttachment(attachpoint, inventoryItem.ID, inventoryItem.AssetID); | 2085 | avatarAppearance.SetAttachment(attachpoint, inventoryItem.ID, inventoryItem.AssetID); |
2097 | m_log.DebugFormat("[RADMIN] Attached {0}", inventoryItem.ID); | 2086 | m_log.DebugFormat("[RADMIN]: Attached {0}", inventoryItem.ID); |
2098 | } | 2087 | } |
2099 | 2088 | ||
2100 | // Record whether or not the item is to be initially worn | 2089 | // Record whether or not the item is to be initially worn |
@@ -2107,32 +2096,32 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2107 | } | 2096 | } |
2108 | catch (Exception e) | 2097 | catch (Exception e) |
2109 | { | 2098 | { |
2110 | m_log.WarnFormat("[RADMIN] Error wearing item {0} : {1}", inventoryItem.ID, e.Message); | 2099 | m_log.WarnFormat("[RADMIN]: Error wearing item {0} : {1}", inventoryItem.ID, e.Message); |
2111 | } | 2100 | } |
2112 | } // foreach item in outfit | 2101 | } // foreach item in outfit |
2113 | m_log.DebugFormat("[RADMIN] Outfit {0} load completed", outfitName); | 2102 | m_log.DebugFormat("[RADMIN]: Outfit {0} load completed", outfitName); |
2114 | } // foreach outfit | 2103 | } // foreach outfit |
2115 | m_log.DebugFormat("[RADMIN] Inventory update complete for {0}", name); | 2104 | m_log.DebugFormat("[RADMIN]: Inventory update complete for {0}", name); |
2116 | scene.AvatarService.SetAppearance(ID, avatarAppearance); | 2105 | scene.AvatarService.SetAppearance(ID, avatarAppearance); |
2117 | } | 2106 | } |
2118 | catch (Exception e) | 2107 | catch (Exception e) |
2119 | { | 2108 | { |
2120 | m_log.WarnFormat("[RADMIN] Inventory processing incomplete for user {0} : {1}", | 2109 | m_log.WarnFormat("[RADMIN]: Inventory processing incomplete for user {0} : {1}", |
2121 | name, e.Message); | 2110 | name, e.Message); |
2122 | } | 2111 | } |
2123 | } // End of include | 2112 | } // End of include |
2124 | } | 2113 | } |
2125 | m_log.DebugFormat("[RADMIN] Default avatar loading complete"); | 2114 | m_log.DebugFormat("[RADMIN]: Default avatar loading complete"); |
2126 | } | 2115 | } |
2127 | else | 2116 | else |
2128 | { | 2117 | { |
2129 | m_log.DebugFormat("[RADMIN] No default avatar information available"); | 2118 | m_log.DebugFormat("[RADMIN]: No default avatar information available"); |
2130 | return false; | 2119 | return false; |
2131 | } | 2120 | } |
2132 | } | 2121 | } |
2133 | catch (Exception e) | 2122 | catch (Exception e) |
2134 | { | 2123 | { |
2135 | m_log.WarnFormat("[RADMIN] Exception whilst loading default avatars ; {0}", e.Message); | 2124 | m_log.WarnFormat("[RADMIN]: Exception whilst loading default avatars ; {0}", e.Message); |
2136 | return false; | 2125 | return false; |
2137 | } | 2126 | } |
2138 | 2127 | ||
@@ -2227,8 +2216,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2227 | } | 2216 | } |
2228 | catch (Exception e) | 2217 | catch (Exception e) |
2229 | { | 2218 | { |
2230 | m_log.InfoFormat("[RADMIN] LoadOAR: {0}", e.Message); | 2219 | m_log.ErrorFormat("[RADMIN]: LoadOAR: {0} {1}", e.Message, e.StackTrace); |
2231 | m_log.DebugFormat("[RADMIN] LoadOAR: {0}", e.ToString()); | ||
2232 | 2220 | ||
2233 | responseData["loaded"] = false; | 2221 | responseData["loaded"] = false; |
2234 | responseData["error"] = e.Message; | 2222 | responseData["error"] = e.Message; |
@@ -2333,8 +2321,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2333 | } | 2321 | } |
2334 | catch (Exception e) | 2322 | catch (Exception e) |
2335 | { | 2323 | { |
2336 | m_log.InfoFormat("[RADMIN] SaveOAR: {0}", e.Message); | 2324 | m_log.ErrorFormat("[RADMIN]: SaveOAR: {0} {1}", e.Message, e.StackTrace); |
2337 | m_log.DebugFormat("[RADMIN] SaveOAR: {0}", e.ToString()); | ||
2338 | 2325 | ||
2339 | responseData["saved"] = false; | 2326 | responseData["saved"] = false; |
2340 | responseData["error"] = e.Message; | 2327 | responseData["error"] = e.Message; |
@@ -2348,7 +2335,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2348 | 2335 | ||
2349 | private void RemoteAdminOarSaveCompleted(Guid uuid, string name) | 2336 | private void RemoteAdminOarSaveCompleted(Guid uuid, string name) |
2350 | { | 2337 | { |
2351 | m_log.DebugFormat("[RADMIN] File processing complete for {0}", name); | 2338 | m_log.DebugFormat("[RADMIN]: File processing complete for {0}", name); |
2352 | lock (m_saveOarLock) Monitor.Pulse(m_saveOarLock); | 2339 | lock (m_saveOarLock) Monitor.Pulse(m_saveOarLock); |
2353 | } | 2340 | } |
2354 | 2341 | ||
@@ -2386,14 +2373,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2386 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; | 2373 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; |
2387 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) | 2374 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) |
2388 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 2375 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
2389 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 2376 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString()); |
2390 | } | 2377 | } |
2391 | else if (requestData.Contains("region_name")) | 2378 | else if (requestData.Contains("region_name")) |
2392 | { | 2379 | { |
2393 | string region_name = (string) requestData["region_name"]; | 2380 | string region_name = (string) requestData["region_name"]; |
2394 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) | 2381 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) |
2395 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); | 2382 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); |
2396 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name); | 2383 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name); |
2397 | } | 2384 | } |
2398 | else throw new Exception("neither region_name nor region_uuid given"); | 2385 | else throw new Exception("neither region_name nor region_uuid given"); |
2399 | 2386 | ||
@@ -2424,8 +2411,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2424 | } | 2411 | } |
2425 | catch (Exception e) | 2412 | catch (Exception e) |
2426 | { | 2413 | { |
2427 | m_log.InfoFormat("[RADMIN] LoadXml: {0}", e.Message); | 2414 | m_log.ErrorFormat("[RADMIN] LoadXml: {0} {1}", e.Message, e.StackTrace); |
2428 | m_log.DebugFormat("[RADMIN] LoadXml: {0}", e.ToString()); | ||
2429 | 2415 | ||
2430 | responseData["loaded"] = false; | 2416 | responseData["loaded"] = false; |
2431 | responseData["switched"] = false; | 2417 | responseData["switched"] = false; |
@@ -2471,14 +2457,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2471 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; | 2457 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; |
2472 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) | 2458 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) |
2473 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 2459 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
2474 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 2460 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString()); |
2475 | } | 2461 | } |
2476 | else if (requestData.Contains("region_name")) | 2462 | else if (requestData.Contains("region_name")) |
2477 | { | 2463 | { |
2478 | string region_name = (string) requestData["region_name"]; | 2464 | string region_name = (string) requestData["region_name"]; |
2479 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) | 2465 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) |
2480 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); | 2466 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); |
2481 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name); | 2467 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name); |
2482 | } | 2468 | } |
2483 | else throw new Exception("neither region_name nor region_uuid given"); | 2469 | else throw new Exception("neither region_name nor region_uuid given"); |
2484 | 2470 | ||
@@ -2510,8 +2496,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2510 | } | 2496 | } |
2511 | catch (Exception e) | 2497 | catch (Exception e) |
2512 | { | 2498 | { |
2513 | m_log.InfoFormat("[RADMIN] SaveXml: {0}", e.Message); | 2499 | m_log.ErrorFormat("[RADMIN]: SaveXml: {0} {1}", e.Message, e.StackTrace); |
2514 | m_log.DebugFormat("[RADMIN] SaveXml: {0}", e.ToString()); | ||
2515 | 2500 | ||
2516 | responseData["saved"] = false; | 2501 | responseData["saved"] = false; |
2517 | responseData["switched"] = false; | 2502 | responseData["switched"] = false; |
@@ -2550,14 +2535,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2550 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; | 2535 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; |
2551 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) | 2536 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) |
2552 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 2537 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
2553 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 2538 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString()); |
2554 | } | 2539 | } |
2555 | else if (requestData.Contains("region_name")) | 2540 | else if (requestData.Contains("region_name")) |
2556 | { | 2541 | { |
2557 | string region_name = (string) requestData["region_name"]; | 2542 | string region_name = (string) requestData["region_name"]; |
2558 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) | 2543 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) |
2559 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); | 2544 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); |
2560 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name); | 2545 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name); |
2561 | } | 2546 | } |
2562 | else throw new Exception("neither region_name nor region_uuid given"); | 2547 | else throw new Exception("neither region_name nor region_uuid given"); |
2563 | 2548 | ||
@@ -2569,7 +2554,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2569 | } | 2554 | } |
2570 | catch (Exception e) | 2555 | catch (Exception e) |
2571 | { | 2556 | { |
2572 | m_log.InfoFormat("[RADMIN] RegionQuery: {0}", e.Message); | 2557 | m_log.InfoFormat("[RADMIN]: RegionQuery: {0}", e.Message); |
2573 | 2558 | ||
2574 | responseData["success"] = false; | 2559 | responseData["success"] = false; |
2575 | responseData["error"] = e.Message; | 2560 | responseData["error"] = e.Message; |
@@ -2610,7 +2595,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2610 | } | 2595 | } |
2611 | catch (Exception e) | 2596 | catch (Exception e) |
2612 | { | 2597 | { |
2613 | m_log.InfoFormat("[RADMIN] ConsoleCommand: {0}", e.Message); | 2598 | m_log.InfoFormat("[RADMIN]: ConsoleCommand: {0}", e.Message); |
2614 | 2599 | ||
2615 | responseData["success"] = false; | 2600 | responseData["success"] = false; |
2616 | responseData["error"] = e.Message; | 2601 | responseData["error"] = e.Message; |
@@ -2647,14 +2632,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2647 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; | 2632 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; |
2648 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) | 2633 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) |
2649 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 2634 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
2650 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 2635 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString()); |
2651 | } | 2636 | } |
2652 | else if (requestData.Contains("region_name")) | 2637 | else if (requestData.Contains("region_name")) |
2653 | { | 2638 | { |
2654 | string region_name = (string) requestData["region_name"]; | 2639 | string region_name = (string) requestData["region_name"]; |
2655 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) | 2640 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) |
2656 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); | 2641 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); |
2657 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name); | 2642 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name); |
2658 | } | 2643 | } |
2659 | else throw new Exception("neither region_name nor region_uuid given"); | 2644 | else throw new Exception("neither region_name nor region_uuid given"); |
2660 | 2645 | ||
@@ -2665,7 +2650,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2665 | } | 2650 | } |
2666 | catch (Exception e) | 2651 | catch (Exception e) |
2667 | { | 2652 | { |
2668 | m_log.InfoFormat("[RADMIN] Access List Clear Request: {0}", e.Message); | 2653 | m_log.ErrorFormat("[RADMIN]: Access List Clear Request: {0} {1}", e.Message, e.StackTrace); |
2669 | 2654 | ||
2670 | responseData["success"] = false; | 2655 | responseData["success"] = false; |
2671 | responseData["error"] = e.Message; | 2656 | responseData["error"] = e.Message; |
@@ -2704,14 +2689,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2704 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; | 2689 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; |
2705 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) | 2690 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) |
2706 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 2691 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
2707 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 2692 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString()); |
2708 | } | 2693 | } |
2709 | else if (requestData.Contains("region_name")) | 2694 | else if (requestData.Contains("region_name")) |
2710 | { | 2695 | { |
2711 | string region_name = (string) requestData["region_name"]; | 2696 | string region_name = (string) requestData["region_name"]; |
2712 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) | 2697 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) |
2713 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); | 2698 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); |
2714 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name); | 2699 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name); |
2715 | } | 2700 | } |
2716 | else throw new Exception("neither region_name nor region_uuid given"); | 2701 | else throw new Exception("neither region_name nor region_uuid given"); |
2717 | 2702 | ||
@@ -2731,7 +2716,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2731 | if (account != null) | 2716 | if (account != null) |
2732 | { | 2717 | { |
2733 | uuids.Add(account.PrincipalID); | 2718 | uuids.Add(account.PrincipalID); |
2734 | m_log.DebugFormat("[RADMIN] adding \"{0}\" to ACL for \"{1}\"", name, scene.RegionInfo.RegionName); | 2719 | m_log.DebugFormat("[RADMIN]: adding \"{0}\" to ACL for \"{1}\"", name, scene.RegionInfo.RegionName); |
2735 | } | 2720 | } |
2736 | } | 2721 | } |
2737 | List<UUID> accessControlList = new List<UUID>(scene.RegionInfo.EstateSettings.EstateAccess); | 2722 | List<UUID> accessControlList = new List<UUID>(scene.RegionInfo.EstateSettings.EstateAccess); |
@@ -2752,7 +2737,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2752 | } | 2737 | } |
2753 | catch (Exception e) | 2738 | catch (Exception e) |
2754 | { | 2739 | { |
2755 | m_log.InfoFormat("[RADMIN] Access List Add Request: {0}", e.Message); | 2740 | m_log.ErrorFormat("[RADMIN]: Access List Add Request: {0} {1}", e.Message, e.StackTrace); |
2756 | 2741 | ||
2757 | responseData["success"] = false; | 2742 | responseData["success"] = false; |
2758 | responseData["error"] = e.Message; | 2743 | responseData["error"] = e.Message; |
@@ -2791,14 +2776,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2791 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; | 2776 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; |
2792 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) | 2777 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) |
2793 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 2778 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
2794 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 2779 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString()); |
2795 | } | 2780 | } |
2796 | else if (requestData.Contains("region_name")) | 2781 | else if (requestData.Contains("region_name")) |
2797 | { | 2782 | { |
2798 | string region_name = (string) requestData["region_name"]; | 2783 | string region_name = (string) requestData["region_name"]; |
2799 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) | 2784 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) |
2800 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); | 2785 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); |
2801 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name); | 2786 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name); |
2802 | } | 2787 | } |
2803 | else throw new Exception("neither region_name nor region_uuid given"); | 2788 | else throw new Exception("neither region_name nor region_uuid given"); |
2804 | 2789 | ||
@@ -2839,7 +2824,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2839 | } | 2824 | } |
2840 | catch (Exception e) | 2825 | catch (Exception e) |
2841 | { | 2826 | { |
2842 | m_log.InfoFormat("[RADMIN] Access List Remove Request: {0}", e.Message); | 2827 | m_log.ErrorFormat("[RADMIN]: Access List Remove Request: {0} {1}", e.Message, e.StackTrace); |
2843 | 2828 | ||
2844 | responseData["success"] = false; | 2829 | responseData["success"] = false; |
2845 | responseData["error"] = e.Message; | 2830 | responseData["error"] = e.Message; |
@@ -2878,14 +2863,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2878 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; | 2863 | UUID region_uuid = (UUID) (string) requestData["region_uuid"]; |
2879 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) | 2864 | if (!m_application.SceneManager.TrySetCurrentScene(region_uuid)) |
2880 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); | 2865 | throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); |
2881 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); | 2866 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_uuid.ToString()); |
2882 | } | 2867 | } |
2883 | else if (requestData.Contains("region_name")) | 2868 | else if (requestData.Contains("region_name")) |
2884 | { | 2869 | { |
2885 | string region_name = (string) requestData["region_name"]; | 2870 | string region_name = (string) requestData["region_name"]; |
2886 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) | 2871 | if (!m_application.SceneManager.TrySetCurrentScene(region_name)) |
2887 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); | 2872 | throw new Exception(String.Format("failed to switch to region {0}", region_name)); |
2888 | m_log.InfoFormat("[RADMIN] Switched to region {0}", region_name); | 2873 | m_log.InfoFormat("[RADMIN]: Switched to region {0}", region_name); |
2889 | } | 2874 | } |
2890 | else throw new Exception("neither region_name nor region_uuid given"); | 2875 | else throw new Exception("neither region_name nor region_uuid given"); |
2891 | 2876 | ||
@@ -2907,7 +2892,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2907 | } | 2892 | } |
2908 | catch (Exception e) | 2893 | catch (Exception e) |
2909 | { | 2894 | { |
2910 | m_log.InfoFormat("[RADMIN] Acces List List: {0}", e.Message); | 2895 | m_log.ErrorFormat("[RADMIN]: Access List List: {0} {1}", e.Message, e.StackTrace); |
2911 | 2896 | ||
2912 | responseData["success"] = false; | 2897 | responseData["success"] = false; |
2913 | responseData["error"] = e.Message; | 2898 | responseData["error"] = e.Message; |