diff options
author | Jeff Ames | 2007-12-10 02:29:42 +0000 |
---|---|---|
committer | Jeff Ames | 2007-12-10 02:29:42 +0000 |
commit | e278d07220f976dec730890e4853ead58f83502a (patch) | |
tree | 14873c24f88ae4e32e75ec286df34de00c0db94f /OpenSim/Region/Environment/Scenes | |
parent | * Hooked up the GridComm event ChildDataUpdate to the scene. (diff) | |
download | opensim-SC_OLD-e278d07220f976dec730890e4853ead58f83502a.zip opensim-SC_OLD-e278d07220f976dec730890e4853ead58f83502a.tar.gz opensim-SC_OLD-e278d07220f976dec730890e4853ead58f83502a.tar.bz2 opensim-SC_OLD-e278d07220f976dec730890e4853ead58f83502a.tar.xz |
refactored ChatModule a bit.
misc cleanup and code convention fixes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index 745345d..0c9f38c 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -156,10 +156,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
156 | } | 156 | } |
157 | } | 157 | } |
158 | } | 158 | } |
159 | |||
159 | public void ProcessAvatarPickerRequest(IClientAPI client, LLUUID avatarID, LLUUID RequestID, string query) | 160 | public void ProcessAvatarPickerRequest(IClientAPI client, LLUUID avatarID, LLUUID RequestID, string query) |
160 | { | 161 | { |
161 | //EventManager.TriggerAvatarPickerRequest(); | 162 | //EventManager.TriggerAvatarPickerRequest(); |
162 | |||
163 | 163 | ||
164 | List<AvatarPickerAvatar> AvatarResponses = new List<AvatarPickerAvatar>(); | 164 | List<AvatarPickerAvatar> AvatarResponses = new List<AvatarPickerAvatar>(); |
165 | AvatarResponses = CommsManager.GenerateAgentPickerRequestResponse(RequestID, query); | 165 | AvatarResponses = CommsManager.GenerateAgentPickerRequestResponse(RequestID, query); |
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
167 | AvatarPickerReplyPacket replyPacket = new AvatarPickerReplyPacket(); | 167 | AvatarPickerReplyPacket replyPacket = new AvatarPickerReplyPacket(); |
168 | AvatarPickerReplyPacket.DataBlock[] searchData = new AvatarPickerReplyPacket.DataBlock[AvatarResponses.Count]; | 168 | AvatarPickerReplyPacket.DataBlock[] searchData = new AvatarPickerReplyPacket.DataBlock[AvatarResponses.Count]; |
169 | AvatarPickerReplyPacket.AgentDataBlock agentData = new AvatarPickerReplyPacket.AgentDataBlock(); | 169 | AvatarPickerReplyPacket.AgentDataBlock agentData = new AvatarPickerReplyPacket.AgentDataBlock(); |
170 | 170 | ||
171 | agentData.AgentID = avatarID; | 171 | agentData.AgentID = avatarID; |
172 | agentData.QueryID = RequestID; | 172 | agentData.QueryID = RequestID; |
173 | replyPacket.AgentData = agentData; | 173 | replyPacket.AgentData = agentData; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 05a59a2..8eef40b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
68 | public Int32 CreationDate; | 68 | public Int32 CreationDate; |
69 | public uint ParentID = 0; | 69 | public uint ParentID = 0; |
70 | 70 | ||
71 | // Main grid has default permissions as follows | 71 | // Main grid has default permissions as follows |
72 | // | 72 | // |
73 | public uint OwnerMask = FULL_MASK_PERMISSIONS_OWNER; | 73 | public uint OwnerMask = FULL_MASK_PERMISSIONS_OWNER; |
74 | public uint NextOwnerMask = OBJNEXT_OWNER; | 74 | public uint NextOwnerMask = OBJNEXT_OWNER; |
@@ -85,7 +85,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
85 | [XmlIgnore] | 85 | [XmlIgnore] |
86 | public uint TimeStampLastActivity = 0; // Will be used for AutoReturn | 86 | public uint TimeStampLastActivity = 0; // Will be used for AutoReturn |
87 | 87 | ||
88 | |||
89 | /// <summary> | 88 | /// <summary> |
90 | /// Only used internally to schedule client updates | 89 | /// Only used internally to schedule client updates |
91 | /// </summary> | 90 | /// </summary> |