aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorroot2011-07-09 01:06:46 +0100
committerroot2011-07-09 01:06:46 +0100
commitc920ff9d1d5840fb6b36efd46e8bec431cc5d15f (patch)
tree4b804cf4255f4a8eaa2789cce97154a418f6e0b5 /OpenSim/Region/CoreModules
parentRemove another core SNAFU. AbsolutePosition is NOT equal to group position (diff)
parentInstance-types-in-list fix for LSL/OSSL functions. This will fix llListFindLi... (diff)
downloadopensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.zip
opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.gz
opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.bz2
opensim-SC-c920ff9d1d5840fb6b36efd46e8bec431cc5d15f.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs6
3 files changed, 13 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index a00e240..90f0ca2 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -53,7 +53,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
53 /// <summary> 53 /// <summary>
54 /// The maximum distance, in standard region units (256m) that an agent is allowed to transfer. 54 /// The maximum distance, in standard region units (256m) that an agent is allowed to transfer.
55 /// </summary> 55 /// </summary>
56 public int MaxTransferDistance { get; set; } 56 private int m_MaxTransferDistance = 4095;
57 public int MaxTransferDistance
58 {
59 get { return m_MaxTransferDistance; }
60 set { m_MaxTransferDistance = value; }
61 }
62
57 63
58 protected bool m_Enabled = false; 64 protected bool m_Enabled = false;
59 protected Scene m_aScene; 65 protected Scene m_aScene;
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 7bad814..a98ce85 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -1030,7 +1030,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
1030 { 1030 {
1031 } 1031 }
1032 1032
1033 public virtual bool GetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID) 1033 public virtual bool CanGetAgentInventoryItem(IClientAPI remoteClient, UUID itemID, UUID requestID)
1034 { 1034 {
1035 InventoryItemBase assetRequestItem = GetItem(remoteClient.AgentId, itemID); 1035 InventoryItemBase assetRequestItem = GetItem(remoteClient.AgentId, itemID);
1036 if (assetRequestItem == null) 1036 if (assetRequestItem == null)
@@ -1109,7 +1109,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
1109 InventoryItemBase item = new InventoryItemBase(itemID, agentID); 1109 InventoryItemBase item = new InventoryItemBase(itemID, agentID);
1110 item = invService.GetItem(item); 1110 item = invService.GetItem(item);
1111 1111
1112 if (item.CreatorData != null && item.CreatorData != string.Empty) 1112 if (item != null && item.CreatorData != null && item.CreatorData != string.Empty)
1113 UserManagementModule.AddUser(item.CreatorIdAsUuid, item.CreatorData); 1113 UserManagementModule.AddUser(item.CreatorIdAsUuid, item.CreatorData);
1114 1114
1115 return item; 1115 return item;
@@ -1117,4 +1117,4 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
1117 1117
1118 #endregion 1118 #endregion
1119 } 1119 }
1120} 1120} \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 6dd871f..0c57618 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -284,9 +284,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
284 284
285 item = m_InventoryService.GetItem(item); 285 item = m_InventoryService.GetItem(item);
286 286
287 if (null == item) 287// if (null == item)
288 m_log.ErrorFormat( 288// m_log.ErrorFormat(
289 "[LOCAL INVENTORY SERVICES CONNECTOR]: Could not find item with id {0}", requestedItemId); 289// "[LOCAL INVENTORY SERVICES CONNECTOR]: Could not find item with id {0}", requestedItemId);
290 290
291 return item; 291 return item;
292 } 292 }