Merge branch 'master' into careminster-presence-refactor

author: Melanie 2011-03-10 07:14:03 +0000
committer: Melanie 2011-03-10 07:14:03 +0000
commit: 9165a5207d81adfedeb07ed32eb095c0c42f086f (patch)
tree: 839af9da6d5d56613312ad7b4fa2b1f9493a4842 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
parent: Change protection from being teleported home to extend to incognito gods. (diff)
parent: Change existing users load iar test so that it fulfills it's original intenti... (diff)
download: opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.zip
opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.gz
opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.bz2
opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
index 81725c5..02751ea 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -712,7 +712,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
            GroupMembershipData data = null;
-            bool foundData = false;
+//            bool foundData = false;
            OSDMap UserGroupMemberInfo;
            if (SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out UserGroupMemberInfo))
author	Melanie	2011-03-10 07:14:03 +0000
committer	Melanie	2011-03-10 07:14:03 +0000
commit	9165a5207d81adfedeb07ed32eb095c0c42f086f (patch)
tree	839af9da6d5d56613312ad7b4fa2b1f9493a4842 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
parent	Change protection from being teleported home to extend to incognito gods. (diff)
parent	Change existing users load iar test so that it fulfills it's original intenti... (diff)
download	opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.zip opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.gz opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.bz2 opensim-SC-9165a5207d81adfedeb07ed32eb095c0c42f086f.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs index 81725c5..02751ea 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -712,7 +712,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
712	if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);	712	if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
713		713
714	GroupMembershipData data = null;	714	GroupMembershipData data = null;
715	bool foundData = false;	715	// bool foundData = false;
716		716
717	OSDMap UserGroupMemberInfo;	717	OSDMap UserGroupMemberInfo;
718	if (SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out UserGroupMemberInfo))	718	if (SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out UserGroupMemberInfo))