diff options
| author | Justin Clark-Casey (justincc) | 2012-03-31 01:07:14 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-31 01:07:14 +0100 |
| commit | 69fc8c4985ebb9e205b86114b7c4e3dd4063153b (patch) | |
| tree | a5ededc741f378e55478bab06efe18619b9465ec /OpenSim | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-69fc8c4985ebb9e205b86114b7c4e3dd4063153b.zip opensim-SC_OLD-69fc8c4985ebb9e205b86114b7c4e3dd4063153b.tar.gz opensim-SC_OLD-69fc8c4985ebb9e205b86114b7c4e3dd4063153b.tar.bz2 opensim-SC_OLD-69fc8c4985ebb9e205b86114b7c4e3dd4063153b.tar.xz | |
minor: small message adjustment and unnecessary code elimination when notifying client of no build permission
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 1c84e77..4dd89d2 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
| @@ -938,7 +938,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
| 938 | ILandObject land = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y); | 938 | ILandObject land = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y); |
| 939 | remoteClient.SendAlertMessage(string.Format( | 939 | remoteClient.SendAlertMessage(string.Format( |
| 940 | "Can't rez object '{0}' at <{1:F3}, {2:F3}, {3:F3}> on parcel '{4}' in region {5}.", | 940 | "Can't rez object '{0}' at <{1:F3}, {2:F3}, {3:F3}> on parcel '{4}' in region {5}.", |
| 941 | item.Name, pos.X, pos.Y, pos.Z, land != null ? land.LandData.Name : "Unknow", m_Scene.RegionInfo.RegionName)); | 941 | item.Name, pos.X, pos.Y, pos.Z, land != null ? land.LandData.Name : "Unknown", m_Scene.RegionInfo.RegionName)); |
| 942 | 942 | ||
| 943 | return false; | 943 | return false; |
| 944 | } | 944 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 954b76f..fc61571 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1978,7 +1978,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1978 | else | 1978 | else |
| 1979 | { | 1979 | { |
| 1980 | IClientAPI client = null; | 1980 | IClientAPI client = null; |
| 1981 | if (this.TryGetClient(ownerID, out client)) | 1981 | if (TryGetClient(ownerID, out client)) |
| 1982 | client.SendAlertMessage("You cannot create objects here."); | 1982 | client.SendAlertMessage("You cannot create objects here."); |
| 1983 | } | 1983 | } |
| 1984 | } | 1984 | } |