diff options
author | Sean Dague | 2008-07-23 15:50:32 +0000 |
---|---|---|
committer | Sean Dague | 2008-07-23 15:50:32 +0000 |
commit | 090159defc731fca252b2b3520364712760f0f4e (patch) | |
tree | 78fe9dde5a9902d67aa6d1690cf575d778d154f2 /OpenSim/Region/Environment/Modules/Avatar | |
parent | Send Animation data for other avatars to new users joining the region (tested... (diff) | |
download | opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.zip opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.gz opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.bz2 opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.xz |
refactored LandData to use properties, and cleaned up the naming on
the properties a bit to be more consistant with other objects (having things
like .Name .Description, etc).
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar')
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index 57524a9..0d22ab9 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs | |||
@@ -1423,7 +1423,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
1423 | else | 1423 | else |
1424 | { | 1424 | { |
1425 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 1425 | ILandObject obj = avatar.Scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
1426 | if ((obj.landData.landFlags & (uint)Parcel.ParcelFlags.AllowDamage) != 0) | 1426 | if ((obj.landData.Flags & (uint)Parcel.ParcelFlags.AllowDamage) != 0) |
1427 | { | 1427 | { |
1428 | avatar.Invulnerable = false; | 1428 | avatar.Invulnerable = false; |
1429 | } | 1429 | } |
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs index 80936f6..1f41a92 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs | |||
@@ -178,7 +178,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice | |||
178 | LandData land = m_scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 178 | LandData land = m_scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
179 | 179 | ||
180 | LLSDParcelVoiceInfoResponse parcelVoiceInfo = | 180 | LLSDParcelVoiceInfoResponse parcelVoiceInfo = |
181 | new LLSDParcelVoiceInfoResponse(regionName, land.localID, creds); | 181 | new LLSDParcelVoiceInfoResponse(regionName, land.LocalID, creds); |
182 | 182 | ||
183 | string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); | 183 | string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); |
184 | 184 | ||
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs index 865894e..c6852f7 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs | |||
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice | |||
147 | LandData land = m_scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); | 147 | LandData land = m_scene.GetLandData(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y); |
148 | 148 | ||
149 | LLSDParcelVoiceInfoResponse parcelVoiceInfo = | 149 | LLSDParcelVoiceInfoResponse parcelVoiceInfo = |
150 | new LLSDParcelVoiceInfoResponse(regionName, land.localID, creds); | 150 | new LLSDParcelVoiceInfoResponse(regionName, land.LocalID, creds); |
151 | 151 | ||
152 | string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); | 152 | string r = LLSDHelpers.SerialiseLLSDReply(parcelVoiceInfo); |
153 | m_log.DebugFormat("[VOICE][PARCELVOICE]: {0}", r); | 153 | m_log.DebugFormat("[VOICE][PARCELVOICE]: {0}", r); |