diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
3 files changed, 25 insertions, 24 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 94782f9..64a9610 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -178,7 +178,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
178 | sbyte assetType, | 178 | sbyte assetType, |
179 | byte wearableType, uint nextOwnerMask, int creationDate) | 179 | byte wearableType, uint nextOwnerMask, int creationDate) |
180 | { | 180 | { |
181 | m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Received request to create inventory item {0} in folder {1}", name, folderID); | 181 | m_log.DebugFormat("[INVENTORY ACCESS MODULE]: Received request to create inventory item {0} in folder {1}, transactionID {2}", name, |
182 | folderID, transactionID); | ||
182 | 183 | ||
183 | if (!m_Scene.Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) | 184 | if (!m_Scene.Permissions.CanCreateUserInventory(invType, remoteClient.AgentId)) |
184 | return; | 185 | return; |
@@ -219,7 +220,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
219 | m_Scene.AssetService.Store(asset); | 220 | m_Scene.AssetService.Store(asset); |
220 | m_Scene.CreateNewInventoryItem( | 221 | m_Scene.CreateNewInventoryItem( |
221 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, | 222 | remoteClient, remoteClient.AgentId.ToString(), string.Empty, folderID, |
222 | name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate,transactionID); | 223 | name, description, 0, callbackID, asset, invType, nextOwnerMask, creationDate,transactionID); |
223 | } | 224 | } |
224 | else | 225 | else |
225 | { | 226 | { |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index c8555ab..bbb280b 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1200,32 +1200,30 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1200 | { | 1200 | { |
1201 | //the proprieties to who changed them | 1201 | //the proprieties to who changed them |
1202 | 1202 | ||
1203 | land.SendLandProperties(0, true, LandChannel.LAND_RESULT_SINGLE, remote_client); | 1203 | land.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, remote_client); |
1204 | 1204 | ||
1205 | if (needOverlay) | 1205 | UUID parcelID = land.LandData.GlobalID; |
1206 | { | 1206 | m_scene.ForEachScenePresence(delegate(ScenePresence avatar) |
1207 | UUID parcelID = land.LandData.GlobalID; | 1207 | { |
1208 | m_scene.ForEachScenePresence(delegate(ScenePresence avatar) | 1208 | if (avatar.IsDeleted || avatar.isNPC) |
1209 | { | 1209 | return; |
1210 | if (avatar.IsDeleted || avatar.isNPC) | ||
1211 | return; | ||
1212 | 1210 | ||
1213 | IClientAPI client = avatar.ControllingClient; | 1211 | IClientAPI client = avatar.ControllingClient; |
1212 | if (needOverlay) | ||
1214 | SendParcelOverlay(client); | 1213 | SendParcelOverlay(client); |
1215 | 1214 | ||
1216 | if (avatar.IsChildAgent) | 1215 | if (avatar.IsChildAgent) |
1217 | return; | 1216 | return; |
1218 | 1217 | ||
1219 | ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 1218 | ILandObject aland = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
1220 | if (aland != null) | 1219 | if (aland != null) |
1221 | { | 1220 | { |
1222 | if (client != remote_client || land != aland) | 1221 | if (client != remote_client || land != aland) |
1223 | aland.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, client); | 1222 | aland.SendLandProperties(0, false, LandChannel.LAND_RESULT_SINGLE, client); |
1224 | } | 1223 | } |
1225 | if (avatar.currentParcelUUID == parcelID) | 1224 | if (avatar.currentParcelUUID == parcelID) |
1226 | avatar.currentParcelUUID = parcelID; // force parcel flags review | 1225 | avatar.currentParcelUUID = parcelID; // force parcel flags review |
1227 | }); | 1226 | }); |
1228 | } | ||
1229 | } | 1227 | } |
1230 | } | 1228 | } |
1231 | 1229 | ||
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index e002feb..a3cd4a5 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -1244,6 +1244,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1244 | public void SetMediaUrl(string url) | 1244 | public void SetMediaUrl(string url) |
1245 | { | 1245 | { |
1246 | LandData.MediaURL = url; | 1246 | LandData.MediaURL = url; |
1247 | m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData); | ||
1247 | SendLandUpdateToAvatarsOverMe(); | 1248 | SendLandUpdateToAvatarsOverMe(); |
1248 | } | 1249 | } |
1249 | 1250 | ||
@@ -1254,6 +1255,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1254 | public void SetMusicUrl(string url) | 1255 | public void SetMusicUrl(string url) |
1255 | { | 1256 | { |
1256 | LandData.MusicURL = url; | 1257 | LandData.MusicURL = url; |
1258 | m_scene.LandChannel.UpdateLandObject(LandData.LocalID, LandData); | ||
1257 | SendLandUpdateToAvatarsOverMe(); | 1259 | SendLandUpdateToAvatarsOverMe(); |
1258 | } | 1260 | } |
1259 | 1261 | ||