aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Avatar
diff options
context:
space:
mode:
authorJeff Ames2008-09-09 01:26:48 +0000
committerJeff Ames2008-09-09 01:26:48 +0000
commitfae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch)
tree2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Region/Environment/Modules/Avatar
parentFix state xxx within state xxx itself triggering a state "change" to (diff)
downloadopensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip
opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz
opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2
opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Avatar')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs26
2 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
index e1599a8..3132eb7 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs
@@ -161,7 +161,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat
161 string message = e.Message; 161 string message = e.Message;
162 UUID fromID = e.SenderUUID; 162 UUID fromID = e.SenderUUID;
163 163
164 if(message.Length >= 1000) // libomv limit 164 if (message.Length >= 1000) // libomv limit
165 message = message.Substring(0, 1000); 165 message = message.Substring(0, 1000);
166 166
167 if (e.Sender != null) 167 if (e.Sender != null)
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 19c193f..8b7df9e 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -820,33 +820,33 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
820 string secret = (string) requestData["secret"]; 820 string secret = (string) requestData["secret"];
821 821
822 Scene userScene = GetSceneByUUID(regionId); 822 Scene userScene = GetSceneByUUID(regionId);
823 if(userScene != null) 823 if (userScene != null)
824 { 824 {
825 if (userScene.RegionInfo.regionSecret.ToString() == secret) 825 if (userScene.RegionInfo.regionSecret.ToString() == secret)
826 { 826 {
827 827
828 IClientAPI client = LocateClientObject(agentId); 828 IClientAPI client = LocateClientObject(agentId);
829 if (client != null) 829 if (client != null)
830 { 830 {
831 831
832 if (soundId != UUID.Zero) 832 if (soundId != UUID.Zero)
833 client.SendPlayAttachedSound(soundId, UUID.Zero, UUID.Zero, 1.0f, 0); 833 client.SendPlayAttachedSound(soundId, UUID.Zero, UUID.Zero, 1.0f, 0);
834 834
835 client.SendBlueBoxMessage(UUID.Zero, UUID.Zero, "", text); 835 client.SendBlueBoxMessage(UUID.Zero, UUID.Zero, "", text);
836 836
837 retparam.Add("success", true); 837 retparam.Add("success", true);
838 } 838 }
839 else 839 else
840 { 840 {
841 retparam.Add("success", false); 841 retparam.Add("success", false);
842 } 842 }
843 } 843 }
844 else 844 else
845 { 845 {
846 retparam.Add("success", false); 846 retparam.Add("success", false);
847 } 847 }
848 } 848 }
849 849
850 ret.Value = retparam; 850 ret.Value = retparam;
851 return ret; 851 return ret;
852 } 852 }