diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 14a4873..8cb40e1 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -97,7 +97,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
97 | private ModelCost m_ModelCost; | 97 | private ModelCost m_ModelCost; |
98 | 98 | ||
99 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. | 99 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. |
100 | 100 | ||
101 | // These are callbacks which will be setup by the scene so that we can update scene data when we | 101 | // These are callbacks which will be setup by the scene so that we can update scene data when we |
102 | // receive capability calls | 102 | // receive capability calls |
103 | public NewInventoryItem AddNewInventoryItem = null; | 103 | public NewInventoryItem AddNewInventoryItem = null; |
@@ -119,7 +119,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
119 | 119 | ||
120 | private bool m_enableModelUploadTextureToInventory = false; // place uploaded textures also in inventory | 120 | private bool m_enableModelUploadTextureToInventory = false; // place uploaded textures also in inventory |
121 | // may not be visible till relog | 121 | // may not be visible till relog |
122 | 122 | ||
123 | private bool m_RestrictFreeTestUploadPerms = false; // reduces also the permitions. Needs a creator defined!! | 123 | private bool m_RestrictFreeTestUploadPerms = false; // reduces also the permitions. Needs a creator defined!! |
124 | private UUID m_testAssetsCreatorID = UUID.Zero; | 124 | private UUID m_testAssetsCreatorID = UUID.Zero; |
125 | 125 | ||
@@ -138,7 +138,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
138 | processUpload = 3 | 138 | processUpload = 3 |
139 | } | 139 | } |
140 | private FileAgentInventoryState m_FileAgentInventoryState = FileAgentInventoryState.idle; | 140 | private FileAgentInventoryState m_FileAgentInventoryState = FileAgentInventoryState.idle; |
141 | 141 | ||
142 | public BunchOfCaps(Scene scene, UUID agentID, Caps caps) | 142 | public BunchOfCaps(Scene scene, UUID agentID, Caps caps) |
143 | { | 143 | { |
144 | m_Scene = scene; | 144 | m_Scene = scene; |
@@ -147,7 +147,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
147 | 147 | ||
148 | // create a model upload cost provider | 148 | // create a model upload cost provider |
149 | m_ModelCost = new ModelCost(scene); | 149 | m_ModelCost = new ModelCost(scene); |
150 | 150 | ||
151 | m_PrimScaleMin = m_ModelCost.PrimScaleMin; | 151 | m_PrimScaleMin = m_ModelCost.PrimScaleMin; |
152 | 152 | ||
153 | IConfigSource config = m_Scene.Config; | 153 | IConfigSource config = m_Scene.Config; |
@@ -216,7 +216,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
216 | 216 | ||
217 | public string GetNewCapPath() | 217 | public string GetNewCapPath() |
218 | { | 218 | { |
219 | return "/CAPS/" + UUID.Random(); | 219 | return "/CAPS/" + UUID.Random(); |
220 | } | 220 | } |
221 | 221 | ||
222 | /// <summary> | 222 | /// <summary> |
@@ -271,7 +271,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
271 | "POST", GetNewCapPath(), HomeLocation, "HomeLocation", null); | 271 | "POST", GetNewCapPath(), HomeLocation, "HomeLocation", null); |
272 | m_HostCapsObj.RegisterHandler("HomeLocation", HomeLocationHandler); | 272 | m_HostCapsObj.RegisterHandler("HomeLocation", HomeLocationHandler); |
273 | } | 273 | } |
274 | 274 | ||
275 | if(m_AllowCapGroupMemberData) | 275 | if(m_AllowCapGroupMemberData) |
276 | { | 276 | { |
277 | IRequestHandler GroupMemberDataHandler = new RestStreamHandler( | 277 | IRequestHandler GroupMemberDataHandler = new RestStreamHandler( |
@@ -314,7 +314,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
314 | IRequestHandler CopyInventoryFromNotecardHandler = new RestStreamHandler( | 314 | IRequestHandler CopyInventoryFromNotecardHandler = new RestStreamHandler( |
315 | "POST", GetNewCapPath(), CopyInventoryFromNotecard, "CopyInventoryFromNotecard", null); | 315 | "POST", GetNewCapPath(), CopyInventoryFromNotecard, "CopyInventoryFromNotecard", null); |
316 | m_HostCapsObj.RegisterHandler("CopyInventoryFromNotecard", CopyInventoryFromNotecardHandler); | 316 | m_HostCapsObj.RegisterHandler("CopyInventoryFromNotecard", CopyInventoryFromNotecardHandler); |
317 | 317 | ||
318 | } | 318 | } |
319 | catch (Exception e) | 319 | catch (Exception e) |
320 | { | 320 | { |
@@ -568,8 +568,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
568 | { | 568 | { |
569 | string error; | 569 | string error; |
570 | int modelcost; | 570 | int modelcost; |
571 | 571 | ||
572 | 572 | ||
573 | if (!m_ModelCost.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost, | 573 | if (!m_ModelCost.MeshModelCost(llsdRequest.asset_resources, baseCost, out modelcost, |
574 | meshcostdata, out error, ref warning)) | 574 | meshcostdata, out error, ref warning)) |
575 | { | 575 | { |
@@ -639,7 +639,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
639 | client.SendAgentAlertMessage(warning, true); | 639 | client.SendAgentAlertMessage(warning, true); |
640 | } | 640 | } |
641 | } | 641 | } |
642 | 642 | ||
643 | string assetDes = llsdRequest.description; | 643 | string assetDes = llsdRequest.description; |
644 | UUID newAsset = UUID.Random(); | 644 | UUID newAsset = UUID.Random(); |
645 | UUID newInvItem = UUID.Random(); | 645 | UUID newInvItem = UUID.Random(); |
@@ -813,7 +813,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
813 | 813 | ||
814 | List<UUID> textures = new List<UUID>(); | 814 | List<UUID> textures = new List<UUID>(); |
815 | 815 | ||
816 | 816 | ||
817 | // if (doTextInv) | 817 | // if (doTextInv) |
818 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); | 818 | m_Scene.TryGetClient(m_HostCapsObj.AgentID, out client); |
819 | 819 | ||
@@ -895,7 +895,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
895 | meshAvatarSkeletons.Add(curAvSkeleton); | 895 | meshAvatarSkeletons.Add(curAvSkeleton); |
896 | meshAvatarColliders.Add(curAvCollider); | 896 | meshAvatarColliders.Add(curAvCollider); |
897 | 897 | ||
898 | // test code | 898 | // test code |
899 | if (curAvSkeleton && client != null) | 899 | if (curAvSkeleton && client != null) |
900 | { | 900 | { |
901 | string name = assetName; | 901 | string name = assetName; |
@@ -1054,7 +1054,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1054 | prim.LastOwnerID = creatorID; | 1054 | prim.LastOwnerID = creatorID; |
1055 | prim.RezzerID = creatorID; | 1055 | prim.RezzerID = creatorID; |
1056 | prim.CreationDate = Util.UnixTimeSinceEpoch(); | 1056 | prim.CreationDate = Util.UnixTimeSinceEpoch(); |
1057 | 1057 | ||
1058 | if (grp == null) | 1058 | if (grp == null) |
1059 | prim.Name = assetName; | 1059 | prim.Name = assetName; |
1060 | else | 1060 | else |
@@ -1437,7 +1437,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1437 | public string GetObjectCost(string request, string path, | 1437 | public string GetObjectCost(string request, string path, |
1438 | string param, IOSHttpRequest httpRequest, | 1438 | string param, IOSHttpRequest httpRequest, |
1439 | IOSHttpResponse httpResponse) | 1439 | IOSHttpResponse httpResponse) |
1440 | { | 1440 | { |
1441 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | 1441 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); |
1442 | OSDMap resp = new OSDMap(); | 1442 | OSDMap resp = new OSDMap(); |
1443 | 1443 | ||
@@ -1446,7 +1446,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1446 | for (int i = 0; i < object_ids.Count; i++) | 1446 | for (int i = 0; i < object_ids.Count; i++) |
1447 | { | 1447 | { |
1448 | UUID uuid = object_ids[i].AsUUID(); | 1448 | UUID uuid = object_ids[i].AsUUID(); |
1449 | 1449 | ||
1450 | SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid); | 1450 | SceneObjectPart part = m_Scene.GetSceneObjectPart(uuid); |
1451 | SceneObjectGroup grp = null; | 1451 | SceneObjectGroup grp = null; |
1452 | if (part != null) | 1452 | if (part != null) |
@@ -1479,7 +1479,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1479 | resp[UUID.Zero.ToString()] = object_data; | 1479 | resp[UUID.Zero.ToString()] = object_data; |
1480 | } | 1480 | } |
1481 | string response = OSDParser.SerializeLLSDXmlString(resp); | 1481 | string response = OSDParser.SerializeLLSDXmlString(resp); |
1482 | return response; | 1482 | return response; |
1483 | } | 1483 | } |
1484 | 1484 | ||
1485 | public string ResourceCostSelected(string request, string path, | 1485 | public string ResourceCostSelected(string request, string path, |
@@ -1548,7 +1548,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1548 | resp["selected"] = object_data; | 1548 | resp["selected"] = object_data; |
1549 | // resp["transaction_id"] = "undef"; | 1549 | // resp["transaction_id"] = "undef"; |
1550 | string response = OSDParser.SerializeLLSDXmlString(resp); | 1550 | string response = OSDParser.SerializeLLSDXmlString(resp); |
1551 | return response; | 1551 | return response; |
1552 | } | 1552 | } |
1553 | 1553 | ||
1554 | public string UpdateAgentInformation(string request, string path, | 1554 | public string UpdateAgentInformation(string request, string path, |
@@ -1564,7 +1564,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1564 | resp["access_prefs"] = accessPrefs; | 1564 | resp["access_prefs"] = accessPrefs; |
1565 | 1565 | ||
1566 | string response = OSDParser.SerializeLLSDXmlString(resp); | 1566 | string response = OSDParser.SerializeLLSDXmlString(resp); |
1567 | return response; | 1567 | return response; |
1568 | } | 1568 | } |
1569 | 1569 | ||
1570 | public bool OSDMapTOVector3(OSDMap map, out Vector3 v) | 1570 | public bool OSDMapTOVector3(OSDMap map, out Vector3 v) |
@@ -1598,19 +1598,19 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1598 | 1598 | ||
1599 | IClientAPI client = null; | 1599 | IClientAPI client = null; |
1600 | ScenePresence sp; | 1600 | ScenePresence sp; |
1601 | 1601 | ||
1602 | while(true) | 1602 | while(true) |
1603 | { | 1603 | { |
1604 | if(m_Scene.GridUserService == null) | 1604 | if(m_Scene.GridUserService == null) |
1605 | break; | 1605 | break; |
1606 | 1606 | ||
1607 | if(m_Scene.UserManagementModule == null) | 1607 | if(m_Scene.UserManagementModule == null) |
1608 | break; | 1608 | break; |
1609 | 1609 | ||
1610 | m_Scene.TryGetScenePresence(m_AgentID, out sp); | 1610 | m_Scene.TryGetScenePresence(m_AgentID, out sp); |
1611 | if(sp == null || sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit) | 1611 | if(sp == null || sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit) |
1612 | break; | 1612 | break; |
1613 | 1613 | ||
1614 | client = sp.ControllingClient; | 1614 | client = sp.ControllingClient; |
1615 | 1615 | ||
1616 | if(!m_Scene.UserManagementModule.IsLocalGridUser(m_AgentID)) | 1616 | if(!m_Scene.UserManagementModule.IsLocalGridUser(m_AgentID)) |
@@ -1637,7 +1637,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1637 | ILandObject land = m_Scene.LandChannel.GetLandObject(pos); | 1637 | ILandObject land = m_Scene.LandChannel.GetLandObject(pos); |
1638 | if(land == null) | 1638 | if(land == null) |
1639 | break; | 1639 | break; |
1640 | 1640 | ||
1641 | ulong gpowers = client.GetGroupPowers(land.LandData.GroupID); | 1641 | ulong gpowers = client.GetGroupPowers(land.LandData.GroupID); |
1642 | SceneObjectGroup telehub = null; | 1642 | SceneObjectGroup telehub = null; |
1643 | if (m_Scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero) | 1643 | if (m_Scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero) |
@@ -1648,7 +1648,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1648 | !m_Scene.Permissions.IsGod(m_AgentID) && | 1648 | !m_Scene.Permissions.IsGod(m_AgentID) && |
1649 | m_AgentID != land.LandData.OwnerID && // (b) land owners can set home | 1649 | m_AgentID != land.LandData.OwnerID && // (b) land owners can set home |
1650 | // (c) members of the land-associated group in roles that can set home | 1650 | // (c) members of the land-associated group in roles that can set home |
1651 | ((gpowers & (ulong)GroupPowers.AllowSetHome) != (ulong)GroupPowers.AllowSetHome) && | 1651 | ((gpowers & (ulong)GroupPowers.AllowSetHome) != (ulong)GroupPowers.AllowSetHome) && |
1652 | // (d) parcels with telehubs can be the home of anyone | 1652 | // (d) parcels with telehubs can be the home of anyone |
1653 | (telehub == null || !land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y))) | 1653 | (telehub == null || !land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y))) |
1654 | { | 1654 | { |
@@ -1675,7 +1675,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1675 | 1675 | ||
1676 | break; | 1676 | break; |
1677 | } | 1677 | } |
1678 | 1678 | ||
1679 | string response; | 1679 | string response; |
1680 | 1680 | ||
1681 | if(fail) | 1681 | if(fail) |
@@ -1728,11 +1728,11 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1728 | m_GroupsModule = m_Scene.RequestModuleInterface<IGroupsModule>(); | 1728 | m_GroupsModule = m_Scene.RequestModuleInterface<IGroupsModule>(); |
1729 | if(m_GroupsModule == null) | 1729 | if(m_GroupsModule == null) |
1730 | break; | 1730 | break; |
1731 | 1731 | ||
1732 | m_Scene.TryGetScenePresence(m_AgentID, out sp); | 1732 | m_Scene.TryGetScenePresence(m_AgentID, out sp); |
1733 | if(sp == null || sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit) | 1733 | if(sp == null || sp.IsChildAgent || sp.IsDeleted || sp.IsInTransit) |
1734 | break; | 1734 | break; |
1735 | 1735 | ||
1736 | client = sp.ControllingClient; | 1736 | client = sp.ControllingClient; |
1737 | 1737 | ||
1738 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | 1738 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); |
@@ -1866,12 +1866,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1866 | OSDMap osdname = new OSDMap(); | 1866 | OSDMap osdname = new OSDMap(); |
1867 | if(parts[0] == "Unknown") | 1867 | if(parts[0] == "Unknown") |
1868 | { | 1868 | { |
1869 | osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1)); | 1869 | osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddHours(1)); |
1870 | osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddHours(2)); | 1870 | osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddHours(2)); |
1871 | } | 1871 | } |
1872 | else | 1872 | else |
1873 | { | 1873 | { |
1874 | osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8)); | 1874 | osdname["display_name_next_update"] = OSD.FromDate(DateTime.UtcNow.AddDays(8)); |
1875 | osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddMonths(1)); | 1875 | osdname["display_name_expires"] = OSD.FromDate(DateTime.UtcNow.AddMonths(1)); |
1876 | } | 1876 | } |
1877 | osdname["display_name"] = OSD.FromString(kvp.Value); | 1877 | osdname["display_name"] = OSD.FromString(kvp.Value); |
@@ -1916,7 +1916,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1916 | private string m_assetType = String.Empty; | 1916 | private string m_assetType = String.Empty; |
1917 | private int m_cost; | 1917 | private int m_cost; |
1918 | private string m_error = String.Empty; | 1918 | private string m_error = String.Empty; |
1919 | 1919 | ||
1920 | private Timer m_timeoutTimer = new Timer(); | 1920 | private Timer m_timeoutTimer = new Timer(); |
1921 | private UUID m_texturesFolder; | 1921 | private UUID m_texturesFolder; |
1922 | private int m_nreqtextures; | 1922 | private int m_nreqtextures; |
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1928 | private int m_groupMask; | 1928 | private int m_groupMask; |
1929 | private int m_everyoneMask; | 1929 | private int m_everyoneMask; |
1930 | 1930 | ||
1931 | 1931 | ||
1932 | public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, | 1932 | public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, |
1933 | UUID parentFolderID, string invType, string assetType, string path, | 1933 | UUID parentFolderID, string invType, string assetType, string path, |
1934 | IHttpServer httpServer, bool dumpAssetsToFile, | 1934 | IHttpServer httpServer, bool dumpAssetsToFile, |