Merge branch 'master' into careminster

7 files changed, 208 insertions, 146 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 0eed284..f3fd249 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -298,25 +298,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event AvatarInterestUpdate OnAvatarInterestUpdate;
         public event PlacesQuery OnPlacesQuery;
         public event AgentFOV OnAgentFOV;
-        public event FindAgentUpdate OnFindAgentEvent;
-        public event TrackAgentUpdate OnTrackAgentEvent;
-        public event NewUserReport OnUserReportEvent;
-        public event SaveStateHandler OnSaveStateEvent;
+        public event FindAgentUpdate OnFindAgent;
+        public event TrackAgentUpdate OnTrackAgent;
+        public event NewUserReport OnUserReport;
+        public event SaveStateHandler OnSaveState;
         public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
         public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
         public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
-        public event FreezeUserUpdate OnParcelFreezeUserEvent;
-        public event EjectUserUpdate OnParcelEjectUserEvent;
+        public event FreezeUserUpdate OnParcelFreezeUser;
+        public event EjectUserUpdate OnParcelEjectUser;
         public event ParcelBuyPass OnParcelBuyPass;
         public event ParcelGodMark OnParcelGodMark;
         public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
         public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         public event SimWideDeletesDelegate OnSimWideDeletes;
         public event SendPostcard OnSendPostcard;
-        public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
-        public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
-        public event GodlikeMessage onGodlikeMessageEvent;
-        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
+        public event MuteListEntryUpdate OnUpdateMuteListEntry;
+        public event MuteListEntryRemove OnRemoveMuteListEntry;
+        public event GodlikeMessage onGodlikeMessage;
+        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
         
 
         #endregion Events
@@ -825,37 +825,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
             OutPacket(gmp, ThrottleOutPacketType.Task);
         }
-        
-        public void SendGroupActiveProposals(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, Dictionary<int, string> VoteID, Dictionary<int, string> VoteInitiator, Dictionary<int, string> Majority, Dictionary<int, string> Quorum, Dictionary<int, string> TerseDateID, Dictionary<int, string> StartDateTime, Dictionary<int, string> EndDateTime, Dictionary<int, string> ProposalText)
+
+        public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
         {
-            foreach (KeyValuePair<int, string> Blank in VoteID)
+            int i = 0;
+            foreach (GroupActiveProposals Proposal in Proposals)
             {
                 GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket();
                 
-                GAPIRP.AgentData.AgentID = agentID;
+                GAPIRP.AgentData.AgentID = AgentId;
                 GAPIRP.AgentData.GroupID = groupID;
                 GAPIRP.TransactionData.TransactionID = transactionID;
-                GAPIRP.TransactionData.TotalNumItems = 1;
+                GAPIRP.TransactionData.TotalNumItems = ((uint)i+1);
                 GroupActiveProposalItemReplyPacket.ProposalDataBlock ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock();
                 GAPIRP.ProposalData = new GroupActiveProposalItemReplyPacket.ProposalDataBlock[1];
                 ProposalData.VoteCast = Utils.StringToBytes("false");
-                ProposalData.VoteID = new UUID(VoteID[Blank.Key]);
-                ProposalData.VoteInitiator = new UUID(VoteInitiator[Blank.Key]);
-                ProposalData.Majority = (float)Convert.ToInt32(Majority[Blank.Key]);
-                ProposalData.Quorum = Convert.ToInt32(Quorum[Blank.Key]);
-                ProposalData.TerseDateID = Utils.StringToBytes(TerseDateID[Blank.Key]);
-                ProposalData.StartDateTime = Utils.StringToBytes(StartDateTime[Blank.Key]);
-                ProposalData.EndDateTime = Utils.StringToBytes(EndDateTime[Blank.Key]);
-                ProposalData.ProposalText = Utils.StringToBytes(ProposalText[Blank.Key]);
+                ProposalData.VoteID = new UUID(Proposal.VoteID);
+                ProposalData.VoteInitiator = new UUID(Proposal.VoteInitiator);
+                ProposalData.Majority = (float)Convert.ToInt32(Proposal.Majority);
+                ProposalData.Quorum = Convert.ToInt32(Proposal.Quorum);
+                ProposalData.TerseDateID = Utils.StringToBytes(Proposal.TerseDateID);
+                ProposalData.StartDateTime = Utils.StringToBytes(Proposal.StartDateTime);
+                ProposalData.EndDateTime = Utils.StringToBytes(Proposal.EndDateTime);
+                ProposalData.ProposalText = Utils.StringToBytes(Proposal.ProposalText);
                 ProposalData.AlreadyVoted = false;
-                GAPIRP.ProposalData[0] = ProposalData;
+                GAPIRP.ProposalData[i] = ProposalData;
                 OutPacket(GAPIRP, ThrottleOutPacketType.Task);
+                i++;
             }
-            if (VoteID.Count == 0)
+            if (Proposals.Length == 0)
             {
                 GroupActiveProposalItemReplyPacket GAPIRP = new GroupActiveProposalItemReplyPacket();
                 
-                GAPIRP.AgentData.AgentID = agentID;
+                GAPIRP.AgentData.AgentID = AgentId;
                 GAPIRP.AgentData.GroupID = groupID;
                 GAPIRP.TransactionData.TransactionID = transactionID;
                 GAPIRP.TransactionData.TotalNumItems = 1;
@@ -875,40 +877,42 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 OutPacket(GAPIRP, ThrottleOutPacketType.Task);
             }
         }
-        
-        public void SendGroupVoteHistory(IClientAPI sender,UUID agentID, UUID sessionID, UUID groupID, UUID transactionID, Dictionary<int, string> VoteID, Dictionary<int, string> VoteInitiator, Dictionary<int, string> Majority, Dictionary<int, string> Quorum, Dictionary<int, string> TerseDateID, Dictionary<int, string> StartDateTime, Dictionary<int, string> EndDateTime, Dictionary<int, string> VoteType, Dictionary<int, string> VoteResult, Dictionary<int, string> ProposalText)
+
+        public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)
         {
-            foreach (KeyValuePair<int, string> Blank in VoteID)
+            int i = 0;
+            foreach (GroupVoteHistory Vote in Votes)
             {
-            GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
-            
-            GVHIRP.AgentData.AgentID = agentID;
-            GVHIRP.AgentData.GroupID = groupID;
-            GVHIRP.TransactionData.TransactionID = transactionID;
-            GVHIRP.TransactionData.TotalNumItems = 1;
-            GVHIRP.HistoryItemData.VoteID = new UUID(VoteID[Blank.Key]);
-            GVHIRP.HistoryItemData.VoteInitiator = new UUID(VoteInitiator[Blank.Key]);
-            GVHIRP.HistoryItemData.Majority = (float)Convert.ToInt32(Majority[Blank.Key]);
-            GVHIRP.HistoryItemData.Quorum = Convert.ToInt32(Quorum[Blank.Key]);
-            GVHIRP.HistoryItemData.TerseDateID = Utils.StringToBytes(TerseDateID[Blank.Key]);
-            GVHIRP.HistoryItemData.StartDateTime = Utils.StringToBytes(StartDateTime[Blank.Key]);
-            GVHIRP.HistoryItemData.EndDateTime = Utils.StringToBytes(EndDateTime[Blank.Key]);
-            GVHIRP.HistoryItemData.VoteType = Utils.StringToBytes(VoteType[Blank.Key]);
-            GVHIRP.HistoryItemData.VoteResult = Utils.StringToBytes(VoteResult[Blank.Key]);
-            GVHIRP.HistoryItemData.ProposalText = Utils.StringToBytes(ProposalText[Blank.Key]);
-            GroupVoteHistoryItemReplyPacket.VoteItemBlock VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock();
-            GVHIRP.VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock[1];
-            VoteItem.CandidateID = UUID.Zero;
-            VoteItem.NumVotes = 0; //TODO: FIX THIS!!!
-            VoteItem.VoteCast = Utils.StringToBytes("Yes");
-            GVHIRP.VoteItem[0] = VoteItem;
-            OutPacket(GVHIRP, ThrottleOutPacketType.Task);
-            }
-            if (VoteID.Count == 0)
+                GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
+
+                GVHIRP.AgentData.AgentID = AgentId;
+                GVHIRP.AgentData.GroupID = groupID;
+                GVHIRP.TransactionData.TransactionID = transactionID;
+                GVHIRP.TransactionData.TotalNumItems = ((uint)i+1);
+                GVHIRP.HistoryItemData.VoteID = new UUID(Vote.VoteID);
+                GVHIRP.HistoryItemData.VoteInitiator = new UUID(Vote.VoteInitiator);
+                GVHIRP.HistoryItemData.Majority = (float)Convert.ToInt32(Vote.Majority);
+                GVHIRP.HistoryItemData.Quorum = Convert.ToInt32(Vote.Quorum);
+                GVHIRP.HistoryItemData.TerseDateID = Utils.StringToBytes(Vote.TerseDateID);
+                GVHIRP.HistoryItemData.StartDateTime = Utils.StringToBytes(Vote.StartDateTime);
+                GVHIRP.HistoryItemData.EndDateTime = Utils.StringToBytes(Vote.EndDateTime);
+                GVHIRP.HistoryItemData.VoteType = Utils.StringToBytes(Vote.VoteType);
+                GVHIRP.HistoryItemData.VoteResult = Utils.StringToBytes(Vote.VoteResult);
+                GVHIRP.HistoryItemData.ProposalText = Utils.StringToBytes(Vote.ProposalText);
+                GroupVoteHistoryItemReplyPacket.VoteItemBlock VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock();
+                GVHIRP.VoteItem = new GroupVoteHistoryItemReplyPacket.VoteItemBlock[1];
+                VoteItem.CandidateID = UUID.Zero;
+                VoteItem.NumVotes = 0; //TODO: FIX THIS!!!
+                VoteItem.VoteCast = Utils.StringToBytes("Yes");
+                GVHIRP.VoteItem[i] = VoteItem;
+                OutPacket(GVHIRP, ThrottleOutPacketType.Task);
+                i++;
+            }
+            if (Votes.Length == 0)
             {
                 GroupVoteHistoryItemReplyPacket GVHIRP = new GroupVoteHistoryItemReplyPacket();
                 
-                GVHIRP.AgentData.AgentID = agentID;
+                GVHIRP.AgentData.AgentID = AgentId;
                 GVHIRP.AgentData.GroupID = groupID;
                 GVHIRP.TransactionData.TransactionID = transactionID;
                 GVHIRP.TransactionData.TotalNumItems = 0;
@@ -4876,7 +4880,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             FreezeUserPacket FreezeUser = (FreezeUserPacket)Packet;
             
-            FreezeUserUpdate FreezeUserHandler = OnParcelFreezeUserEvent;
+            FreezeUserUpdate FreezeUserHandler = OnParcelFreezeUser;
             if (FreezeUserHandler != null)
             {
                 FreezeUserHandler(this,
@@ -4893,7 +4897,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             EjectUserPacket EjectUser =
                 (EjectUserPacket)Packet;
             
-            EjectUserUpdate EjectUserHandler = OnParcelEjectUserEvent;
+            EjectUserUpdate EjectUserHandler = OnParcelEjectUser;
             if (EjectUserHandler != null)
             {
                 EjectUserHandler(this,
@@ -5292,7 +5296,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             FindAgentPacket FindAgent =
                 (FindAgentPacket)Packet;
             
-            FindAgentUpdate FindAgentHandler = OnFindAgentEvent;
+            FindAgentUpdate FindAgentHandler = OnFindAgent;
             if (FindAgentHandler != null)
             {
                 FindAgentHandler(this,FindAgent.AgentBlock.Hunter,FindAgent.AgentBlock.Prey);
@@ -5306,7 +5310,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             TrackAgentPacket TrackAgent =
                 (TrackAgentPacket)Packet;
             
-            TrackAgentUpdate TrackAgentHandler = OnTrackAgentEvent;
+            TrackAgentUpdate TrackAgentHandler = OnTrackAgent;
             if (TrackAgentHandler != null)
             {
                 TrackAgentHandler(this,
@@ -8592,7 +8596,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             GodUpdateRegionInfoPacket GodUpdateRegionInfo =
                 (GodUpdateRegionInfoPacket)Packet;
 
-            GodUpdateRegionInfoUpdate handlerGodUpdateRegionInfo = OnGodUpdateRegionInfoUpdateEvent;
+            GodUpdateRegionInfoUpdate handlerGodUpdateRegionInfo = OnGodUpdateRegionInfoUpdate;
             if (handlerGodUpdateRegionInfo != null)
             {
                 handlerGodUpdateRegionInfo(this,
@@ -8625,7 +8629,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             GodlikeMessagePacket GodlikeMessage =
                 (GodlikeMessagePacket)Packet;
 
-            GodlikeMessage handlerGodlikeMessage = onGodlikeMessageEvent;
+            GodlikeMessage handlerGodlikeMessage = onGodlikeMessage;
             if (handlerGodlikeMessage != null)
             {
                 handlerGodlikeMessage(this,
@@ -8641,7 +8645,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             StateSavePacket SaveStateMessage =
                 (StateSavePacket)Packet;
-            SaveStateHandler handlerSaveStatePacket = OnSaveStateEvent;
+            SaveStateHandler handlerSaveStatePacket = OnSaveState;
             if (handlerSaveStatePacket != null)
             {
                 handlerSaveStatePacket(this,SaveStateMessage.AgentData.AgentID);
@@ -9005,7 +9009,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             UpdateMuteListEntryPacket UpdateMuteListEntry =
                 (UpdateMuteListEntryPacket)Packet;
-            MuteListEntryUpdate handlerUpdateMuteListEntry = OnUpdateMuteListEntryEvent;
+            MuteListEntryUpdate handlerUpdateMuteListEntry = OnUpdateMuteListEntry;
             if (handlerUpdateMuteListEntry != null)
             {
                 handlerUpdateMuteListEntry(this, UpdateMuteListEntry.MuteData.MuteID,
@@ -9021,7 +9025,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             RemoveMuteListEntryPacket RemoveMuteListEntry =
                 (RemoveMuteListEntryPacket)Packet;
-            MuteListEntryRemove handlerRemoveMuteListEntry = OnRemoveMuteListEntryEvent;
+            MuteListEntryRemove handlerRemoveMuteListEntry = OnRemoveMuteListEntry;
             if (handlerRemoveMuteListEntry != null)
             {
                 handlerRemoveMuteListEntry(this,
@@ -9038,7 +9042,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             UserReportPacket UserReport =
                 (UserReportPacket)Packet;
 
-            NewUserReport handlerUserReport = OnUserReportEvent;
+            NewUserReport handlerUserReport = OnUserReport;
             if (handlerUserReport != null)
             {
                 handlerUserReport(this,
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index a4a649c..086d4fe 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -397,8 +397,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             client.OnLogout += OnLogout;
             
             client.OnGrantUserRights += GrantUserFriendRights;
-            client.OnTrackAgentEvent += FindAgent;
-            client.OnFindAgentEvent += FindAgent;
+            client.OnTrackAgent += FindAgent;
+            client.OnFindAgent += FindAgent;
 
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 7f9e5af..257c221 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -47,6 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private bool enabled = true;
         private List<Scene> m_SceneList = new List<Scene>();
         private string m_RestURL = String.Empty;
+        private bool m_ForwardOfflineGroupMessages = true;
 
         public void Initialise(Scene scene, IConfigSource config)
         {
@@ -67,6 +68,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
             }
 
+            if (cnf != null)
+                m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", m_ForwardOfflineGroupMessages);
+
             lock (m_SceneList)
             {
                 if (m_SceneList.Count == 0)
@@ -185,7 +189,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         private void UndeliveredMessage(GridInstantMessage im)
         {
-            if (im.offline != 0)
+            if ((im.offline != 0)
+                && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages)))
             {
                 bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>(
                         "POST", m_RestURL+"/SaveMessage/", im);
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 4cdc33d..3659711 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -274,25 +274,25 @@ namespace OpenSim.Region.Examples.SimpleModule
 
         public event PlacesQuery OnPlacesQuery;
         
-        public event FindAgentUpdate OnFindAgentEvent;
-        public event TrackAgentUpdate OnTrackAgentEvent;
-        public event NewUserReport OnUserReportEvent;
-        public event SaveStateHandler OnSaveStateEvent;
+        public event FindAgentUpdate OnFindAgent;
+        public event TrackAgentUpdate OnTrackAgent;
+        public event NewUserReport OnUserReport;
+        public event SaveStateHandler OnSaveState;
         public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
         public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
         public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
-        public event FreezeUserUpdate OnParcelFreezeUserEvent;
-        public event EjectUserUpdate OnParcelEjectUserEvent;
+        public event FreezeUserUpdate OnParcelFreezeUser;
+        public event EjectUserUpdate OnParcelEjectUser;
         public event ParcelBuyPass OnParcelBuyPass;
         public event ParcelGodMark OnParcelGodMark;
         public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
         public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         public event SimWideDeletesDelegate OnSimWideDeletes;
         public event SendPostcard OnSendPostcard;
-        public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
-        public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
-        public event GodlikeMessage onGodlikeMessageEvent;
-        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
+        public event MuteListEntryUpdate OnUpdateMuteListEntry;
+        public event MuteListEntryRemove OnRemoveMuteListEntry;
+        public event GodlikeMessage onGodlikeMessage;
+        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
 
 #pragma warning restore 67
 
@@ -1133,7 +1133,15 @@ namespace OpenSim.Region.Examples.SimpleModule
         }
         
         public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
-        {
+        {

+        }

+

+        public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)

+        {

+        }

+

+        public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)

+        {

         }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a14e3ad..e5fc027 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -139,7 +139,16 @@ namespace OpenSim.Region.Framework.Scenes
         public uint TimeStampTerse;
 
         [XmlIgnore]
-        public UUID FromItemID;
+        public UUID FromItemID;

+

+        [XmlIgnore]

+        public int STATUS_ROTATE_X;

+

+        [XmlIgnore]

+        public int STATUS_ROTATE_Y;

+

+        [XmlIgnore]

+        public int STATUS_ROTATE_Z;
         
         [XmlIgnore]
         private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>();
@@ -1675,6 +1684,19 @@ namespace OpenSim.Region.Framework.Scenes
                 return false;
 
             return m_parentGroup.RootPart.DIE_AT_EDGE;
+        }

+

+        public int GetAxisRotation(int axis)

+        {

+            //Cannot use ScriptBaseClass constants as no referance to it currently.

+            if (axis == 2)//STATUS_ROTATE_X

+                return STATUS_ROTATE_X;

+            if (axis == 4)//STATUS_ROTATE_Y

+                return STATUS_ROTATE_Y;

+            if (axis == 8)//STATUS_ROTATE_Z

+                return STATUS_ROTATE_Z;

+

+            return 0;

         }
 
         public double GetDistanceTo(Vector3 a, Vector3 b)
@@ -1923,24 +1945,24 @@ namespace OpenSim.Region.Framework.Scenes
                                 else
                                 {
                                 }
-                            }
-                            else
-                            {
+                            }

+                            else

+                            {

                                 bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
-                                //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work
-                                if (found)
-                                {
-                                    DetectedObject detobj = new DetectedObject();
-                                    detobj.keyUUID = obj.UUID;
-                                    detobj.nameStr = obj.Name;
-                                    detobj.ownerUUID = obj._ownerID;
-                                    detobj.posVector = obj.AbsolutePosition;
-                                    detobj.rotQuat = obj.GetWorldRotation();
-                                    detobj.velVector = obj.Velocity;
-                                    detobj.colliderType = 0;
-                                    detobj.groupUUID = obj._groupID;
-                                    colliding.Add(detobj);
-                                }
+                                //If it is 1, it is to accept ONLY collisions from this object, so this other object will not work

+                                if (found)

+                                {

+                                    DetectedObject detobj = new DetectedObject();

+                                    detobj.keyUUID = obj.UUID;

+                                    detobj.nameStr = obj.Name;

+                                    detobj.ownerUUID = obj._ownerID;

+                                    detobj.posVector = obj.AbsolutePosition;

+                                    detobj.rotQuat = obj.GetWorldRotation();

+                                    detobj.velVector = obj.Velocity;

+                                    detobj.colliderType = 0;

+                                    detobj.groupUUID = obj._groupID;

+                                    colliding.Add(detobj);

+                                }

                             }
                         }
                         else
@@ -1952,8 +1974,8 @@ namespace OpenSim.Region.Framework.Scenes
                                 ScenePresence av = avlist[i];
 
                                 if (av.LocalId == localId)
-                                {
-                                    if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+                                {

+                                    if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name))
                                     {
                                         bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
                                         //If it is 1, it is to accept ONLY collisions from this avatar
@@ -1974,24 +1996,24 @@ namespace OpenSim.Region.Framework.Scenes
                                         else
                                         {
                                         }
-                                    }
-                                    else
-                                    {
+                                    }

+                                    else

+                                    {

                                         bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
-                                        //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
-                                        if (found)
-                                        {
-                                            DetectedObject detobj = new DetectedObject();
-                                            detobj.keyUUID = av.UUID;
-                                            detobj.nameStr = av.ControllingClient.Name;
-                                            detobj.ownerUUID = av.UUID;
-                                            detobj.posVector = av.AbsolutePosition;
-                                            detobj.rotQuat = av.Rotation;
-                                            detobj.velVector = av.Velocity;
-                                            detobj.colliderType = 0;
-                                            detobj.groupUUID = av.ControllingClient.ActiveGroupId;
-                                            colliding.Add(detobj);
-                                        }
+                                        //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work

+                                        if (!found)

+                                        {

+                                            DetectedObject detobj = new DetectedObject();

+                                            detobj.keyUUID = av.UUID;

+                                            detobj.nameStr = av.ControllingClient.Name;

+                                            detobj.ownerUUID = av.UUID;

+                                            detobj.posVector = av.AbsolutePosition;

+                                            detobj.rotQuat = av.Rotation;

+                                            detobj.velVector = av.Velocity;

+                                            detobj.colliderType = 0;

+                                            detobj.groupUUID = av.ControllingClient.ActiveGroupId;

+                                            colliding.Add(detobj);

+                                        }

                                     }
 
                                 }
@@ -2088,8 +2110,8 @@ namespace OpenSim.Region.Framework.Scenes
                                 ScenePresence av = avlist[i];
 
                                 if (av.LocalId == localId)
-                                {
-                                    if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+                                {

+                                    if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name))
                                     {
                                         bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
                                         //If it is 1, it is to accept ONLY collisions from this avatar
@@ -2115,7 +2137,7 @@ namespace OpenSim.Region.Framework.Scenes
                                     {
                                         bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
                                         //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
-                                        if (found)
+                                        if (!found)
                                         {
                                             DetectedObject detobj = new DetectedObject();
                                             detobj.keyUUID = av.UUID;
@@ -2219,8 +2241,8 @@ namespace OpenSim.Region.Framework.Scenes
                                 ScenePresence av = avlist[i];
 
                                 if (av.LocalId == localId)
-                                {
-                                    if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(obj.Name))
+                                {

+                                    if (m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.UUID.ToString()) || m_parentGroup.RootPart.CollisionFilter.ContainsValue(av.Name))
                                     {
                                         bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
                                         //If it is 1, it is to accept ONLY collisions from this avatar
@@ -2246,7 +2268,7 @@ namespace OpenSim.Region.Framework.Scenes
                                     {
                                         bool found = m_parentGroup.RootPart.CollisionFilter.TryGetValue(1,out data);
                                         //If it is 1, it is to accept ONLY collisions from this avatar, so this other avatar will not work
-                                        if (found)
+                                        if (!found)
                                         {
                                             DetectedObject detobj = new DetectedObject();
                                             detobj.keyUUID = av.UUID;
@@ -2279,7 +2301,7 @@ namespace OpenSim.Region.Framework.Scenes
                         m_parentGroup.Scene.EventManager.TriggerScriptCollidingEnd(LocalId, EndCollidingMessage);
                     }
                 }
-            }
+            }

         }
 
         public void PhysicsOutOfBounds(Vector3 pos)
@@ -2747,7 +2769,14 @@ namespace OpenSim.Region.Framework.Scenes
             if (m_parentGroup != null)
             {
                 m_parentGroup.SetAxisRotation(axis, rotate);
-            }
+            }

+            //Cannot use ScriptBaseClass constants as no referance to it currently.

+            if (axis == 2)//STATUS_ROTATE_X

+                STATUS_ROTATE_X = rotate;

+            if (axis == 4)//STATUS_ROTATE_Y

+                STATUS_ROTATE_Y = rotate;

+            if (axis == 8)//STATUS_ROTATE_Z

+                STATUS_ROTATE_Z = rotate;
         }
 
         public void SetBuoyancy(float fvalue)
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 7907570..671cfef 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -836,25 +836,25 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public event MuteListRequest OnMuteListRequest;
         public event AvatarInterestUpdate OnAvatarInterestUpdate;
         public event PlacesQuery OnPlacesQuery;
-        public event FindAgentUpdate OnFindAgentEvent;
-        public event TrackAgentUpdate OnTrackAgentEvent;
-        public event NewUserReport OnUserReportEvent;
-        public event SaveStateHandler OnSaveStateEvent;
+        public event FindAgentUpdate OnFindAgent;
+        public event TrackAgentUpdate OnTrackAgent;
+        public event NewUserReport OnUserReport;
+        public event SaveStateHandler OnSaveState;
         public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
         public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
         public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
-        public event FreezeUserUpdate OnParcelFreezeUserEvent;
-        public event EjectUserUpdate OnParcelEjectUserEvent;
+        public event FreezeUserUpdate OnParcelFreezeUser;
+        public event EjectUserUpdate OnParcelEjectUser;
         public event ParcelBuyPass OnParcelBuyPass;
         public event ParcelGodMark OnParcelGodMark;
         public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
         public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         public event SimWideDeletesDelegate OnSimWideDeletes;
         public event SendPostcard OnSendPostcard;
-        public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
-        public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
-        public event GodlikeMessage onGodlikeMessageEvent;
-        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
+        public event MuteListEntryUpdate OnUpdateMuteListEntry;
+        public event MuteListEntryRemove OnRemoveMuteListEntry;
+        public event GodlikeMessage onGodlikeMessage;
+        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
 
 #pragma warning restore 67
 
@@ -1657,7 +1657,15 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         }
         
         public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
-        {
+        {

+        }

+

+        public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)

+        {

+        }

+

+        public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)

+        {

         }
     }
 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index c862821..1639b7e 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -380,25 +380,25 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         public event PlacesQuery OnPlacesQuery;
         
-        public event FindAgentUpdate OnFindAgentEvent;
-        public event TrackAgentUpdate OnTrackAgentEvent;
-        public event NewUserReport OnUserReportEvent;
-        public event SaveStateHandler OnSaveStateEvent;
+        public event FindAgentUpdate OnFindAgent;
+        public event TrackAgentUpdate OnTrackAgent;
+        public event NewUserReport OnUserReport;
+        public event SaveStateHandler OnSaveState;
         public event GroupAccountSummaryRequest OnGroupAccountSummaryRequest;
         public event GroupAccountDetailsRequest OnGroupAccountDetailsRequest;
         public event GroupAccountTransactionsRequest OnGroupAccountTransactionsRequest;
-        public event FreezeUserUpdate OnParcelFreezeUserEvent;
-        public event EjectUserUpdate OnParcelEjectUserEvent;
+        public event FreezeUserUpdate OnParcelFreezeUser;
+        public event EjectUserUpdate OnParcelEjectUser;
         public event ParcelBuyPass OnParcelBuyPass;
         public event ParcelGodMark OnParcelGodMark;
         public event GroupActiveProposalsRequest OnGroupActiveProposalsRequest;
         public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
         public event SimWideDeletesDelegate OnSimWideDeletes;
         public event SendPostcard OnSendPostcard;
-        public event MuteListEntryUpdate OnUpdateMuteListEntryEvent;
-        public event MuteListEntryRemove OnRemoveMuteListEntryEvent;
-        public event GodlikeMessage onGodlikeMessageEvent;
-        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdateEvent;
+        public event MuteListEntryUpdate OnUpdateMuteListEntry;
+        public event MuteListEntryRemove OnRemoveMuteListEntry;
+        public event GodlikeMessage onGodlikeMessage;
+        public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
 
 #pragma warning restore 67
 
@@ -1138,7 +1138,15 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         }
         
         public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
-        {
+        {

+        }

+

+        public void SendGroupVoteHistory(UUID groupID, UUID transactionID, GroupVoteHistory[] Votes)

+        {

+        }

+

+        public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)

+        {

         }
     }
 }