aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSignpostMarv2012-10-23 16:02:31 +0100
committerJustin Clark-Casey (justincc)2012-10-26 02:08:00 +0100
commit80dcc13af2b33a5621bac49f15cbf6a97d2d8e16 (patch)
tree6a0609d1ef53b1cddfb34f79d1ca087e7bbad36d
parentadding ability for listeners to be filtered by regular expressions and a gene... (diff)
downloadopensim-SC_OLD-80dcc13af2b33a5621bac49f15cbf6a97d2d8e16.zip
opensim-SC_OLD-80dcc13af2b33a5621bac49f15cbf6a97d2d8e16.tar.gz
opensim-SC_OLD-80dcc13af2b33a5621bac49f15cbf6a97d2d8e16.tar.bz2
opensim-SC_OLD-80dcc13af2b33a5621bac49f15cbf6a97d2d8e16.tar.xz
refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field with a private setter
-rw-r--r--OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs20
-rw-r--r--OpenSim/Region/Framework/Interfaces/IWorldComm.cs3
2 files changed, 9 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index cf0eb2a..401ff6c 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -711,8 +711,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
711 continue; 711 continue;
712 } 712 }
713 if (li.GetName().Length > 0 && ( 713 if (li.GetName().Length > 0 && (
714 ((li.GetRegexBitfield() & OS_LISTEN_REGEX_NAME) != OS_LISTEN_REGEX_NAME && !li.GetName().Equals(name)) || 714 ((li.RegexBitfield & OS_LISTEN_REGEX_NAME) != OS_LISTEN_REGEX_NAME && !li.GetName().Equals(name)) ||
715 ((li.GetRegexBitfield() & OS_LISTEN_REGEX_NAME) == OS_LISTEN_REGEX_NAME && !Regex.IsMatch(name, li.GetName())) 715 ((li.RegexBitfield & OS_LISTEN_REGEX_NAME) == OS_LISTEN_REGEX_NAME && !Regex.IsMatch(name, li.GetName()))
716 )) 716 ))
717 { 717 {
718 continue; 718 continue;
@@ -722,8 +722,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
722 continue; 722 continue;
723 } 723 }
724 if (li.GetMessage().Length > 0 && ( 724 if (li.GetMessage().Length > 0 && (
725 ((li.GetRegexBitfield() & OS_LISTEN_REGEX_MESSAGE) != OS_LISTEN_REGEX_MESSAGE && !li.GetMessage().Equals(msg)) || 725 ((li.RegexBitfield & OS_LISTEN_REGEX_MESSAGE) != OS_LISTEN_REGEX_MESSAGE && !li.GetMessage().Equals(msg)) ||
726 ((li.GetRegexBitfield() & OS_LISTEN_REGEX_MESSAGE) == OS_LISTEN_REGEX_MESSAGE && !Regex.IsMatch(msg, li.GetMessage())) 726 ((li.RegexBitfield & OS_LISTEN_REGEX_MESSAGE) == OS_LISTEN_REGEX_MESSAGE && !Regex.IsMatch(msg, li.GetMessage()))
727 )) 727 ))
728 { 728 {
729 continue; 729 continue;
@@ -791,7 +791,6 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
791 private UUID m_id; // ID to filter messages from 791 private UUID m_id; // ID to filter messages from
792 private string m_name; // Object name to filter messages from 792 private string m_name; // Object name to filter messages from
793 private string m_message; // The message 793 private string m_message; // The message
794 private int m_regexBitfield; // The regex bitfield
795 794
796 public ListenerInfo(int handle, uint localID, UUID ItemID, UUID hostID, int channel, string name, UUID id, string message) 795 public ListenerInfo(int handle, uint localID, UUID ItemID, UUID hostID, int channel, string name, UUID id, string message)
797 { 796 {
@@ -828,7 +827,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
828 m_name = name; 827 m_name = name;
829 m_id = id; 828 m_id = id;
830 m_message = message; 829 m_message = message;
831 m_regexBitfield = regexBitfield; 830 RegexBitfield = regexBitfield;
832 } 831 }
833 832
834 public Object[] GetSerializationData() 833 public Object[] GetSerializationData()
@@ -841,7 +840,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
841 data[3] = m_name; 840 data[3] = m_name;
842 data[4] = m_id; 841 data[4] = m_id;
843 data[5] = m_message; 842 data[5] = m_message;
844 data[6] = m_regexBitfield; 843 data[6] = RegexBitfield;
845 844
846 return data; 845 return data;
847 } 846 }
@@ -852,7 +851,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
852 linfo.m_active = (bool)data[0]; 851 linfo.m_active = (bool)data[0];
853 if (data.Length >= 7) 852 if (data.Length >= 7)
854 { 853 {
855 linfo.m_regexBitfield = (int)data[6]; 854 linfo.RegexBitfield = (int)data[6];
856 } 855 }
857 856
858 return linfo; 857 return linfo;
@@ -913,9 +912,6 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
913 return m_id; 912 return m_id;
914 } 913 }
915 914
916 public int GetRegexBitfield() 915 public int RegexBitfield { get; private set; }
917 {
918 return m_regexBitfield;
919 }
920 } 916 }
921} 917}
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
index 66b3f3a..d76a0d7 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs
@@ -51,8 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces
51 /// 1 corresponds to IWorldCommListenerInfo::GetName() 51 /// 1 corresponds to IWorldCommListenerInfo::GetName()
52 /// 2 corresponds to IWorldCommListenerInfo::GetMessage() 52 /// 2 corresponds to IWorldCommListenerInfo::GetMessage()
53 /// </summary> 53 /// </summary>
54 /// <returns></returns> 54 int RegexBitfield { get; }
55 int GetRegexBitfield();
56 } 55 }
57 56
58 public interface IWorldComm 57 public interface IWorldComm