aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/OptionalModules/Agent
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs254
-rw-r--r--OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs20
-rw-r--r--OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs182
3 files changed, 228 insertions, 228 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 8b8ebe0..83b534b 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -589,8 +589,8 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
589 { 589 {
590 return new Dictionary<UUID, ulong>(); 590 return new Dictionary<UUID, ulong>();
591 } 591 }
592 592
593 public void SetGroupPowers(Dictionary<UUID, ulong> powers) { } 593 public void SetGroupPowers(Dictionary<UUID, ulong> powers) { }
594 594
595 public ulong GetGroupPowers(UUID groupID) 595 public ulong GetGroupPowers(UUID groupID)
596 { 596 {
@@ -898,12 +898,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
898 898
899 public void InPacket(object NewPack) 899 public void InPacket(object NewPack)
900 { 900 {
901 901
902 } 902 }
903 903
904 public void ProcessInPacket(Packet NewPack) 904 public void ProcessInPacket(Packet NewPack)
905 { 905 {
906 906
907 } 907 }
908 908
909 public void Close() 909 public void Close()
@@ -953,32 +953,32 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
953 953
954 public void SendWearables(AvatarWearable[] wearables, int serial) 954 public void SendWearables(AvatarWearable[] wearables, int serial)
955 { 955 {
956 956
957 } 957 }
958 958
959 public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry) 959 public void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry)
960 { 960 {
961 961
962 } 962 }
963 963
964 public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures) 964 public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
965 { 965 {
966 966
967 } 967 }
968 968
969 public void SendStartPingCheck(byte seq) 969 public void SendStartPingCheck(byte seq)
970 { 970 {
971 971
972 } 972 }
973 973
974 public void SendKillObject(List<uint> localID) 974 public void SendKillObject(List<uint> localID)
975 { 975 {
976 976
977 } 977 }
978 978
979 public void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs) 979 public void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
980 { 980 {
981 981
982 } 982 }
983 983
984 public void SendChatMessage( 984 public void SendChatMessage(
@@ -1005,7 +1005,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1005 1005
1006 public void SendGenericMessage(string method, UUID invoice, List<byte[]> message) 1006 public void SendGenericMessage(string method, UUID invoice, List<byte[]> message)
1007 { 1007 {
1008 1008
1009 } 1009 }
1010 1010
1011 public virtual bool CanSendLayerData() 1011 public virtual bool CanSendLayerData()
@@ -1015,32 +1015,32 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1015 1015
1016 public void SendLayerData(float[] map) 1016 public void SendLayerData(float[] map)
1017 { 1017 {
1018 1018
1019 } 1019 }
1020 1020
1021 public void SendLayerData(int px, int py, float[] map) 1021 public void SendLayerData(int px, int py, float[] map)
1022 { 1022 {
1023 1023
1024 } 1024 }
1025 1025
1026 public void SendWindData(int version, Vector2[] windSpeeds) 1026 public void SendWindData(int version, Vector2[] windSpeeds)
1027 { 1027 {
1028 1028
1029 } 1029 }
1030 1030
1031 public void SendCloudData(int version, float[] cloudCover) 1031 public void SendCloudData(int version, float[] cloudCover)
1032 { 1032 {
1033 1033
1034 } 1034 }
1035 1035
1036 public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look) 1036 public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
1037 { 1037 {
1038 1038
1039 } 1039 }
1040 1040
1041 public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint) 1041 public void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint)
1042 { 1042 {
1043 1043
1044 } 1044 }
1045 1045
1046 public AgentCircuitData RequestClientInfo() 1046 public AgentCircuitData RequestClientInfo()
@@ -1050,32 +1050,32 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1050 1050
1051 public void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL) 1051 public void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL)
1052 { 1052 {
1053 1053
1054 } 1054 }
1055 1055
1056 public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag) 1056 public void SendMapBlock(List<MapBlockData> mapBlocks, uint flag)
1057 { 1057 {
1058 1058
1059 } 1059 }
1060 1060
1061 public void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags) 1061 public void SendLocalTeleport(Vector3 position, Vector3 lookAt, uint flags)
1062 { 1062 {
1063 1063
1064 } 1064 }
1065 1065
1066 public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL) 1066 public void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL)
1067 { 1067 {
1068 1068
1069 } 1069 }
1070 1070
1071 public void SendTeleportFailed(string reason) 1071 public void SendTeleportFailed(string reason)
1072 { 1072 {
1073 1073
1074 } 1074 }
1075 1075
1076 public void SendTeleportStart(uint flags) 1076 public void SendTeleportStart(uint flags)
1077 { 1077 {
1078 1078
1079 } 1079 }
1080 1080
1081 public void SendTeleportProgress(uint flags, string message) 1081 public void SendTeleportProgress(uint flags, string message)
@@ -1084,17 +1084,17 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1084 1084
1085 public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item) 1085 public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item)
1086 { 1086 {
1087 1087
1088 } 1088 }
1089 1089
1090 public void SendPayPrice(UUID objectID, int[] payPrice) 1090 public void SendPayPrice(UUID objectID, int[] payPrice)
1091 { 1091 {
1092 1092
1093 } 1093 }
1094 1094
1095 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations) 1095 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
1096 { 1096 {
1097 1097
1098 } 1098 }
1099 1099
1100 public void SendAvatarDataImmediate(ISceneEntity avatar) 1100 public void SendAvatarDataImmediate(ISceneEntity avatar)
@@ -1119,12 +1119,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1119 1119
1120 public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems) 1120 public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, int version, bool fetchFolders, bool fetchItems)
1121 { 1121 {
1122 1122
1123 } 1123 }
1124 1124
1125 public void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item) 1125 public void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item)
1126 { 1126 {
1127 1127
1128 } 1128 }
1129 1129
1130 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId) 1130 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId)
@@ -1139,72 +1139,72 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1139 1139
1140 public void SendRemoveInventoryItem(UUID itemID) 1140 public void SendRemoveInventoryItem(UUID itemID)
1141 { 1141 {
1142 1142
1143 } 1143 }
1144 1144
1145 public void SendTakeControls(int controls, bool passToAgent, bool TakeControls) 1145 public void SendTakeControls(int controls, bool passToAgent, bool TakeControls)
1146 { 1146 {
1147 1147
1148 } 1148 }
1149 1149
1150 public void SendTaskInventory(UUID taskID, short serial, byte[] fileName) 1150 public void SendTaskInventory(UUID taskID, short serial, byte[] fileName)
1151 { 1151 {
1152 1152
1153 } 1153 }
1154 1154
1155 public void SendBulkUpdateInventory(InventoryNodeBase node) 1155 public void SendBulkUpdateInventory(InventoryNodeBase node)
1156 { 1156 {
1157 1157
1158 } 1158 }
1159 1159
1160 public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) 1160 public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
1161 { 1161 {
1162 1162
1163 } 1163 }
1164 1164
1165 public void SendAbortXferPacket(ulong xferID) 1165 public void SendAbortXferPacket(ulong xferID)
1166 { 1166 {
1167 1167
1168 } 1168 }
1169 1169
1170 public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent) 1170 public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent)
1171 { 1171 {
1172 1172
1173 } 1173 }
1174 1174
1175 public void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data) 1175 public void SendAvatarPickerReply(AvatarPickerReplyAgentDataArgs AgentData, List<AvatarPickerReplyDataArgs> Data)
1176 { 1176 {
1177 1177
1178 } 1178 }
1179 1179
1180 public void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle) 1180 public void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
1181 { 1181 {
1182 1182
1183 } 1183 }
1184 1184
1185 public void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID) 1185 public void SendPreLoadSound(UUID objectID, UUID ownerID, UUID soundID)
1186 { 1186 {
1187 1187
1188 } 1188 }
1189 1189
1190 public void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain, byte flags) 1190 public void SendPlayAttachedSound(UUID soundID, UUID objectID, UUID ownerID, float gain, byte flags)
1191 { 1191 {
1192 1192
1193 } 1193 }
1194 1194
1195 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain) 1195 public void SendTriggeredSound(UUID soundID, UUID ownerID, UUID objectID, UUID parentID, ulong handle, Vector3 position, float gain)
1196 { 1196 {
1197 1197
1198 } 1198 }
1199 1199
1200 public void SendAttachedSoundGainChange(UUID objectID, float gain) 1200 public void SendAttachedSoundGainChange(UUID objectID, float gain)
1201 { 1201 {
1202 1202
1203 } 1203 }
1204 1204
1205 public void SendNameReply(UUID profileId, string firstname, string lastname) 1205 public void SendNameReply(UUID profileId, string firstname, string lastname)
1206 { 1206 {
1207 1207
1208 } 1208 }
1209 1209
1210 public void SendAlertMessage(string message) 1210 public void SendAlertMessage(string message)
@@ -1214,12 +1214,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1214 1214
1215 public void SendAgentAlertMessage(string message, bool modal) 1215 public void SendAgentAlertMessage(string message, bool modal)
1216 { 1216 {
1217 1217
1218 } 1218 }
1219 1219
1220 public void SendAlertMessage(string message, string info) 1220 public void SendAlertMessage(string message, string info)
1221 { 1221 {
1222 1222
1223 } 1223 }
1224 1224
1225 public void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url) 1225 public void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url)
@@ -1229,77 +1229,77 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1229 1229
1230 public void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) 1230 public void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)
1231 { 1231 {
1232 1232
1233 } 1233 }
1234 1234
1235 public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition) 1235 public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition)
1236 { 1236 {
1237 1237
1238 } 1238 }
1239 1239
1240 public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks) 1240 public void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks)
1241 { 1241 {
1242 1242
1243 } 1243 }
1244 1244
1245 public void SendViewerTime(int phase) 1245 public void SendViewerTime(int phase)
1246 { 1246 {
1247 1247
1248 } 1248 }
1249 1249
1250 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] membershipType, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID) 1250 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, byte[] membershipType, string flAbout, uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID)
1251 { 1251 {
1252 1252
1253 } 1253 }
1254 1254
1255 public void SendScriptQuestion(UUID taskID, string taskName, string ownerName, UUID itemID, int question) 1255 public void SendScriptQuestion(UUID taskID, string taskName, string ownerName, UUID itemID, int question)
1256 { 1256 {
1257 1257
1258 } 1258 }
1259 1259
1260 public void SendHealth(float health) 1260 public void SendHealth(float health)
1261 { 1261 {
1262 1262
1263 } 1263 }
1264 1264
1265 public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID) 1265 public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
1266 { 1266 {
1267 1267
1268 } 1268 }
1269 1269
1270 public void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID) 1270 public void SendBannedUserList(UUID invoice, EstateBan[] banlist, uint estateID)
1271 { 1271 {
1272 1272
1273 } 1273 }
1274 1274
1275 public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args) 1275 public void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args)
1276 { 1276 {
1277 1277
1278 } 1278 }
1279 1279
1280 public void SendEstateCovenantInformation(UUID covenant) 1280 public void SendEstateCovenantInformation(UUID covenant)
1281 { 1281 {
1282 1282
1283 } 1283 }
1284 1284
1285 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner) 1285 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner)
1286 { 1286 {
1287 1287
1288 } 1288 }
1289 1289
1290 public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags) 1290 public void SendLandProperties(int sequence_id, bool snap_selection, int request_result, ILandObject lo, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags)
1291 { 1291 {
1292 1292
1293 } 1293 }
1294 1294
1295 public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID) 1295 public void SendLandAccessListData(List<LandAccessEntry> accessList, uint accessFlag, int localLandID)
1296 { 1296 {
1297 1297
1298 } 1298 }
1299 1299
1300 public void SendForceClientSelectObjects(List<uint> objectIDs) 1300 public void SendForceClientSelectObjects(List<uint> objectIDs)
1301 { 1301 {
1302 1302
1303 } 1303 }
1304 1304
1305 public void SendCameraConstraint(Vector4 ConstraintPlane) 1305 public void SendCameraConstraint(Vector4 ConstraintPlane)
@@ -1309,57 +1309,57 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1309 1309
1310 public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount) 1310 public void SendLandObjectOwners(LandData land, List<UUID> groups, Dictionary<UUID, int> ownersAndCount)
1311 { 1311 {
1312 1312
1313 } 1313 }
1314 1314
1315 public void SendLandParcelOverlay(byte[] data, int sequence_id) 1315 public void SendLandParcelOverlay(byte[] data, int sequence_id)
1316 { 1316 {
1317 1317
1318 } 1318 }
1319 1319
1320 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time) 1320 public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time)
1321 { 1321 {
1322 1322
1323 } 1323 }
1324 1324
1325 public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop) 1325 public void SendParcelMediaUpdate(string mediaUrl, UUID mediaTextureID, byte autoScale, string mediaType, string mediaDesc, int mediaWidth, int mediaHeight, byte mediaLoop)
1326 { 1326 {
1327 1327
1328 } 1328 }
1329 1329
1330 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) 1330 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
1331 { 1331 {
1332 1332
1333 } 1333 }
1334 1334
1335 public void SendConfirmXfer(ulong xferID, uint PacketID) 1335 public void SendConfirmXfer(ulong xferID, uint PacketID)
1336 { 1336 {
1337 1337
1338 } 1338 }
1339 1339
1340 public void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName) 1340 public void SendXferRequest(ulong XferID, short AssetType, UUID vFileID, byte FilePath, byte[] FileName)
1341 { 1341 {
1342 1342
1343 } 1343 }
1344 1344
1345 public void SendInitiateDownload(string simFileName, string clientFileName) 1345 public void SendInitiateDownload(string simFileName, string clientFileName)
1346 { 1346 {
1347 1347
1348 } 1348 }
1349 1349
1350 public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec) 1350 public void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
1351 { 1351 {
1352 1352
1353 } 1353 }
1354 1354
1355 public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData) 1355 public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData)
1356 { 1356 {
1357 1357
1358 } 1358 }
1359 1359
1360 public void SendImageNotFound(UUID imageid) 1360 public void SendImageNotFound(UUID imageid)
1361 { 1361 {
1362 1362
1363 } 1363 }
1364 1364
1365 public void SendShutdownConnectionNotice() 1365 public void SendShutdownConnectionNotice()
@@ -1369,12 +1369,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1369 1369
1370 public void SendSimStats(SimStats stats) 1370 public void SendSimStats(SimStats stats)
1371 { 1371 {
1372 1372
1373 } 1373 }
1374 1374
1375 public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags) 1375 public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags)
1376 { 1376 {
1377 1377
1378 } 1378 }
1379 1379
1380 public void SendObjectPropertiesReply(ISceneEntity entity) 1380 public void SendObjectPropertiesReply(ISceneEntity entity)
@@ -1383,12 +1383,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1383 1383
1384 public void SendAgentOffline(UUID[] agentIDs) 1384 public void SendAgentOffline(UUID[] agentIDs)
1385 { 1385 {
1386 1386
1387 } 1387 }
1388 1388
1389 public void SendAgentOnline(UUID[] agentIDs) 1389 public void SendAgentOnline(UUID[] agentIDs)
1390 { 1390 {
1391 1391
1392 } 1392 }
1393 1393
1394 public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY) 1394 public void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY)
@@ -1397,62 +1397,62 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1397 1397
1398 public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook) 1398 public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook)
1399 { 1399 {
1400 1400
1401 } 1401 }
1402 1402
1403 public void SendAdminResponse(UUID Token, uint AdminLevel) 1403 public void SendAdminResponse(UUID Token, uint AdminLevel)
1404 { 1404 {
1405 1405
1406 } 1406 }
1407 1407
1408 public void SendGroupMembership(GroupMembershipData[] GroupMembership) 1408 public void SendGroupMembership(GroupMembershipData[] GroupMembership)
1409 { 1409 {
1410 1410
1411 } 1411 }
1412 1412
1413 public void SendGroupNameReply(UUID groupLLUID, string GroupName) 1413 public void SendGroupNameReply(UUID groupLLUID, string GroupName)
1414 { 1414 {
1415 1415
1416 } 1416 }
1417 1417
1418 public void SendJoinGroupReply(UUID groupID, bool success) 1418 public void SendJoinGroupReply(UUID groupID, bool success)
1419 { 1419 {
1420 1420
1421 } 1421 }
1422 1422
1423 public void SendEjectGroupMemberReply(UUID agentID, UUID groupID, bool success) 1423 public void SendEjectGroupMemberReply(UUID agentID, UUID groupID, bool success)
1424 { 1424 {
1425 1425
1426 } 1426 }
1427 1427
1428 public void SendLeaveGroupReply(UUID groupID, bool success) 1428 public void SendLeaveGroupReply(UUID groupID, bool success)
1429 { 1429 {
1430 1430
1431 } 1431 }
1432 1432
1433 public void SendCreateGroupReply(UUID groupID, bool success, string message) 1433 public void SendCreateGroupReply(UUID groupID, bool success, string message)
1434 { 1434 {
1435 1435
1436 } 1436 }
1437 1437
1438 public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia) 1438 public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia)
1439 { 1439 {
1440 1440
1441 } 1441 }
1442 1442
1443 public void SendScriptRunningReply(UUID objectID, UUID itemID, bool running) 1443 public void SendScriptRunningReply(UUID objectID, UUID itemID, bool running)
1444 { 1444 {
1445 1445
1446 } 1446 }
1447 1447
1448 public void SendAsset(AssetRequestToClient req) 1448 public void SendAsset(AssetRequestToClient req)
1449 { 1449 {
1450 1450
1451 } 1451 }
1452 1452
1453 public void SendTexture(AssetBase TextureAsset) 1453 public void SendTexture(AssetBase TextureAsset)
1454 { 1454 {
1455 1455
1456 } 1456 }
1457 1457
1458 public virtual void SetChildAgentThrottle(byte[] throttle) 1458 public virtual void SetChildAgentThrottle(byte[] throttle)
@@ -1467,7 +1467,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1467 1467
1468 public void SetAgentThrottleSilent(int throttle, int setting) 1468 public void SetAgentThrottleSilent(int throttle, int setting)
1469 { 1469 {
1470 1470
1471 1471
1472 } 1472 }
1473 public byte[] GetThrottlesPacked(float multiplier) 1473 public byte[] GetThrottlesPacked(float multiplier)
@@ -1498,12 +1498,12 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1498 1498
1499 public void SetClientInfo(ClientInfo info) 1499 public void SetClientInfo(ClientInfo info)
1500 { 1500 {
1501 1501
1502 } 1502 }
1503 1503
1504 public void SetClientOption(string option, string value) 1504 public void SetClientOption(string option, string value)
1505 { 1505 {
1506 1506
1507 } 1507 }
1508 1508
1509 public string GetClientOption(string option) 1509 public string GetClientOption(string option)
@@ -1518,67 +1518,67 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1518 1518
1519 public void SendSetFollowCamProperties(UUID objectID, SortedDictionary<int, float> parameters) 1519 public void SendSetFollowCamProperties(UUID objectID, SortedDictionary<int, float> parameters)
1520 { 1520 {
1521 1521
1522 } 1522 }
1523 1523
1524 public void SendClearFollowCamProperties(UUID objectID) 1524 public void SendClearFollowCamProperties(UUID objectID)
1525 { 1525 {
1526 1526
1527 } 1527 }
1528 1528
1529 public void SendRegionHandle(UUID regoinID, ulong handle) 1529 public void SendRegionHandle(UUID regoinID, ulong handle)
1530 { 1530 {
1531 1531
1532 } 1532 }
1533 1533
1534 public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y) 1534 public void SendParcelInfo(RegionInfo info, LandData land, UUID parcelID, uint x, uint y)
1535 { 1535 {
1536 1536
1537 } 1537 }
1538 1538
1539 public void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt) 1539 public void SendScriptTeleportRequest(string objName, string simName, Vector3 pos, Vector3 lookAt)
1540 { 1540 {
1541 1541
1542 } 1542 }
1543 1543
1544 public void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data) 1544 public void SendDirPlacesReply(UUID queryID, DirPlacesReplyData[] data)
1545 { 1545 {
1546 1546
1547 } 1547 }
1548 1548
1549 public void SendDirPeopleReply(UUID queryID, DirPeopleReplyData[] data) 1549 public void SendDirPeopleReply(UUID queryID, DirPeopleReplyData[] data)
1550 { 1550 {
1551 1551
1552 } 1552 }
1553 1553
1554 public void SendDirEventsReply(UUID queryID, DirEventsReplyData[] data) 1554 public void SendDirEventsReply(UUID queryID, DirEventsReplyData[] data)
1555 { 1555 {
1556 1556
1557 } 1557 }
1558 1558
1559 public void SendDirGroupsReply(UUID queryID, DirGroupsReplyData[] data) 1559 public void SendDirGroupsReply(UUID queryID, DirGroupsReplyData[] data)
1560 { 1560 {
1561 1561
1562 } 1562 }
1563 1563
1564 public void SendDirClassifiedReply(UUID queryID, DirClassifiedReplyData[] data) 1564 public void SendDirClassifiedReply(UUID queryID, DirClassifiedReplyData[] data)
1565 { 1565 {
1566 1566
1567 } 1567 }
1568 1568
1569 public void SendDirLandReply(UUID queryID, DirLandReplyData[] data) 1569 public void SendDirLandReply(UUID queryID, DirLandReplyData[] data)
1570 { 1570 {
1571 1571
1572 } 1572 }
1573 1573
1574 public void SendDirPopularReply(UUID queryID, DirPopularReplyData[] data) 1574 public void SendDirPopularReply(UUID queryID, DirPopularReplyData[] data)
1575 { 1575 {
1576 1576
1577 } 1577 }
1578 1578
1579 public void SendEventInfoReply(EventData info) 1579 public void SendEventInfoReply(EventData info)
1580 { 1580 {
1581 1581
1582 } 1582 }
1583 1583
1584 public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint) 1584 public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint)
@@ -1588,7 +1588,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1588 1588
1589 public void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags) 1589 public void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags)
1590 { 1590 {
1591 1591
1592 } 1592 }
1593 1593
1594 public void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data) 1594 public void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data)
@@ -1603,78 +1603,78 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1603 1603
1604 public void SendOfferCallingCard(UUID srcID, UUID transactionID) 1604 public void SendOfferCallingCard(UUID srcID, UUID transactionID)
1605 { 1605 {
1606 1606
1607 } 1607 }
1608 1608
1609 public void SendAcceptCallingCard(UUID transactionID) 1609 public void SendAcceptCallingCard(UUID transactionID)
1610 { 1610 {
1611 1611
1612 } 1612 }
1613 1613
1614 public void SendDeclineCallingCard(UUID transactionID) 1614 public void SendDeclineCallingCard(UUID transactionID)
1615 { 1615 {
1616 1616
1617 } 1617 }
1618 1618
1619 public void SendTerminateFriend(UUID exFriendID) 1619 public void SendTerminateFriend(UUID exFriendID)
1620 { 1620 {
1621 1621
1622 } 1622 }
1623 1623
1624 public void SendAvatarClassifiedReply(UUID targetID, UUID[] classifiedID, string[] name) 1624 public void SendAvatarClassifiedReply(UUID targetID, UUID[] classifiedID, string[] name)
1625 { 1625 {
1626 1626
1627 } 1627 }
1628 1628
1629 public void SendClassifiedInfoReply(UUID classifiedID, UUID creatorID, uint creationDate, uint expirationDate, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, string simName, Vector3 globalPos, string parcelName, byte classifiedFlags, int price) 1629 public void SendClassifiedInfoReply(UUID classifiedID, UUID creatorID, uint creationDate, uint expirationDate, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, string simName, Vector3 globalPos, string parcelName, byte classifiedFlags, int price)
1630 { 1630 {
1631 1631
1632 } 1632 }
1633 1633
1634 public void SendAgentDropGroup(UUID groupID) 1634 public void SendAgentDropGroup(UUID groupID)
1635 { 1635 {
1636 1636
1637 } 1637 }
1638 1638
1639 public void RefreshGroupMembership() 1639 public void RefreshGroupMembership()
1640 { 1640 {
1641 1641
1642 } 1642 }
1643 1643
1644 public void UpdateGroupMembership(GroupMembershipData[] data) 1644 public void UpdateGroupMembership(GroupMembershipData[] data)
1645 { 1645 {
1646 1646
1647 } 1647 }
1648 1648
1649 public void GroupMembershipRemove(UUID GroupID) 1649 public void GroupMembershipRemove(UUID GroupID)
1650 { 1650 {
1651 1651
1652 } 1652 }
1653 1653
1654 public void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers) 1654 public void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers)
1655 { 1655 {
1656 1656
1657 } 1657 }
1658 1658
1659 1659
1660 public void SendAvatarNotesReply(UUID targetID, string text) 1660 public void SendAvatarNotesReply(UUID targetID, string text)
1661 { 1661 {
1662 1662
1663 } 1663 }
1664 1664
1665 public void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks) 1665 public void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks)
1666 { 1666 {
1667 1667
1668 } 1668 }
1669 1669
1670 public void SendPickInfoReply(UUID pickID, UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled) 1670 public void SendPickInfoReply(UUID pickID, UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled)
1671 { 1671 {
1672 1672
1673 } 1673 }
1674 1674
1675 public void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds) 1675 public void SendAvatarClassifiedReply(UUID targetID, Dictionary<UUID, string> classifieds)
1676 { 1676 {
1677 1677
1678 } 1678 }
1679 1679
1680 public void SendAvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages) 1680 public void SendAvatarInterestUpdate(IClientAPI client, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages)
@@ -1684,22 +1684,22 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1684 1684
1685 public void SendParcelDwellReply(int localID, UUID parcelID, float dwell) 1685 public void SendParcelDwellReply(int localID, UUID parcelID, float dwell)
1686 { 1686 {
1687 1687
1688 } 1688 }
1689 1689
1690 public void SendUserInfoReply(bool imViaEmail, bool visible, string email) 1690 public void SendUserInfoReply(bool imViaEmail, bool visible, string email)
1691 { 1691 {
1692 1692
1693 } 1693 }
1694 1694
1695 public void SendUseCachedMuteList() 1695 public void SendUseCachedMuteList()
1696 { 1696 {
1697 1697
1698 } 1698 }
1699 1699
1700 public void SendMuteListUpdate(string filename) 1700 public void SendMuteListUpdate(string filename)
1701 { 1701 {
1702 1702
1703 } 1703 }
1704 1704
1705 public bool AddGenericPacketHandler(string MethodName, GenericMessage handler) 1705 public bool AddGenericPacketHandler(string MethodName, GenericMessage handler)
@@ -1716,15 +1716,15 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1716 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages) 1716 public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages)
1717 { 1717 {
1718 } 1718 }
1719 1719
1720 public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt) 1720 public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt)
1721 { 1721 {
1722 } 1722 }
1723 1723
1724 public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier) 1724 public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier)
1725 { 1725 {
1726 } 1726 }
1727 1727
1728 public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) 1728 public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt)
1729 { 1729 {
1730 } 1730 }
@@ -1748,7 +1748,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1748 public void SendAgentTerseUpdate(ISceneEntity presence) 1748 public void SendAgentTerseUpdate(ISceneEntity presence)
1749 { 1749 {
1750 } 1750 }
1751 1751
1752 public void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data) 1752 public void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data)
1753 { 1753 {
1754 } 1754 }
diff --git a/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs b/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
index c897aa5..e93fcdc 100644
--- a/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs
@@ -54,36 +54,36 @@ namespace OpenSim.Region.OptionalModules.Agent.TextureSender
54// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 54// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
55 55
56 private Scene m_scene; 56 private Scene m_scene;
57 57
58 public string Name { get { return "Asset Information Module"; } } 58 public string Name { get { return "Asset Information Module"; } }
59 59
60 public Type ReplaceableInterface { get { return null; } } 60 public Type ReplaceableInterface { get { return null; } }
61 61
62 public void Initialise(IConfigSource source) 62 public void Initialise(IConfigSource source)
63 { 63 {
64// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: INITIALIZED MODULE"); 64// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: INITIALIZED MODULE");
65 } 65 }
66 66
67 public void PostInitialise() 67 public void PostInitialise()
68 { 68 {
69// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: POST INITIALIZED MODULE"); 69// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: POST INITIALIZED MODULE");
70 } 70 }
71 71
72 public void Close() 72 public void Close()
73 { 73 {
74// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: CLOSED MODULE"); 74// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: CLOSED MODULE");
75 } 75 }
76 76
77 public void AddRegion(Scene scene) 77 public void AddRegion(Scene scene)
78 { 78 {
79// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); 79// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
80 } 80 }
81 81
82 public void RemoveRegion(Scene scene) 82 public void RemoveRegion(Scene scene)
83 { 83 {
84// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName); 84// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
85 } 85 }
86 86
87 public void RegionLoaded(Scene scene) 87 public void RegionLoaded(Scene scene)
88 { 88 {
89// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName); 89// m_log.DebugFormat("[J2K DECODER COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
@@ -117,10 +117,10 @@ namespace OpenSim.Region.OptionalModules.Agent.TextureSender
117 MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId); 117 MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId);
118 return; 118 return;
119 } 119 }
120 120
121 AssetBase asset = m_scene.AssetService.Get(assetId.ToString()); 121 AssetBase asset = m_scene.AssetService.Get(assetId.ToString());
122 if (asset == null) 122 if (asset == null)
123 { 123 {
124 MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId); 124 MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId);
125 return; 125 return;
126 } 126 }
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 071530b..3be5a07 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -52,48 +52,48 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
52 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LindenUDPInfoModule")] 52 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LindenUDPInfoModule")]
53 public class LindenUDPInfoModule : ISharedRegionModule 53 public class LindenUDPInfoModule : ISharedRegionModule
54 { 54 {
55 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 55 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
56 56
57 protected Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); 57 protected Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
58 58
59 public string Name { get { return "Linden UDP Module"; } } 59 public string Name { get { return "Linden UDP Module"; } }
60 60
61 public Type ReplaceableInterface { get { return null; } } 61 public Type ReplaceableInterface { get { return null; } }
62 62
63 public void Initialise(IConfigSource source) 63 public void Initialise(IConfigSource source)
64 { 64 {
65// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: INITIALIZED MODULE"); 65// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: INITIALIZED MODULE");
66 } 66 }
67 67
68 public void PostInitialise() 68 public void PostInitialise()
69 { 69 {
70// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: POST INITIALIZED MODULE"); 70// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: POST INITIALIZED MODULE");
71 } 71 }
72 72
73 public void Close() 73 public void Close()
74 { 74 {
75// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: CLOSED MODULE"); 75// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: CLOSED MODULE");
76 } 76 }
77 77
78 public void AddRegion(Scene scene) 78 public void AddRegion(Scene scene)
79 { 79 {
80// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); 80// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
81 81
82 lock (m_scenes) 82 lock (m_scenes)
83 m_scenes[scene.RegionInfo.RegionID] = scene; 83 m_scenes[scene.RegionInfo.RegionID] = scene;
84 84
85 scene.AddCommand( 85 scene.AddCommand(
86 "Comms", this, "show pqueues", 86 "Comms", this, "show pqueues",
87 "show pqueues [full]", 87 "show pqueues [full]",
88 "Show priority queue data for each client", 88 "Show priority queue data for each client",
89 "Without the 'full' option, only root agents are shown." 89 "Without the 'full' option, only root agents are shown."
90 + " With the 'full' option child agents are also shown.", 90 + " With the 'full' option child agents are also shown.",
91 (mod, cmd) => MainConsole.Instance.Output(GetPQueuesReport(cmd))); 91 (mod, cmd) => MainConsole.Instance.Output(GetPQueuesReport(cmd)));
92 92
93 scene.AddCommand( 93 scene.AddCommand(
94 "Comms", this, "show queues", 94 "Comms", this, "show queues",
95 "show queues [full]", 95 "show queues [full]",
96 "Show queue data for each client", 96 "Show queue data for each client",
97 "Without the 'full' option, only root agents are shown.\n" 97 "Without the 'full' option, only root agents are shown.\n"
98 + "With the 'full' option child agents are also shown.\n\n" 98 + "With the 'full' option child agents are also shown.\n\n"
99 + "Type - Rt is a root (avatar) client whilst cd is a child (neighbour interacting) client.\n" 99 + "Type - Rt is a root (avatar) client whilst cd is a child (neighbour interacting) client.\n"
@@ -116,13 +116,13 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
116 "clear image queues <first-name> <last-name>", 116 "clear image queues <first-name> <last-name>",
117 "Clear the image queues (textures downloaded via UDP) for a particular client.", 117 "Clear the image queues (textures downloaded via UDP) for a particular client.",
118 (mod, cmd) => MainConsole.Instance.Output(HandleImageQueuesClear(cmd))); 118 (mod, cmd) => MainConsole.Instance.Output(HandleImageQueuesClear(cmd)));
119 119
120 scene.AddCommand( 120 scene.AddCommand(
121 "Comms", this, "show throttles", 121 "Comms", this, "show throttles",
122 "show throttles [full]", 122 "show throttles [full]",
123 "Show throttle settings for each client and for the server overall", 123 "Show throttle settings for each client and for the server overall",
124 "Without the 'full' option, only root agents are shown." 124 "Without the 'full' option, only root agents are shown."
125 + " With the 'full' option child agents are also shown.", 125 + " With the 'full' option child agents are also shown.",
126 (mod, cmd) => MainConsole.Instance.Output(GetThrottlesReport(cmd))); 126 (mod, cmd) => MainConsole.Instance.Output(GetThrottlesReport(cmd)));
127 127
128 scene.AddCommand( 128 scene.AddCommand(
@@ -134,15 +134,15 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
134 (mod, cmd) => MainConsole.Instance.Output(HandleClientStatsReport(cmd))); 134 (mod, cmd) => MainConsole.Instance.Output(HandleClientStatsReport(cmd)));
135 135
136 } 136 }
137 137
138 public void RemoveRegion(Scene scene) 138 public void RemoveRegion(Scene scene)
139 { 139 {
140// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName); 140// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
141 141
142 lock (m_scenes) 142 lock (m_scenes)
143 m_scenes.Remove(scene.RegionInfo.RegionID); 143 m_scenes.Remove(scene.RegionInfo.RegionID);
144 } 144 }
145 145
146 public void RegionLoaded(Scene scene) 146 public void RegionLoaded(Scene scene)
147 { 147 {
148// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName); 148// m_log.DebugFormat("[LINDEN UDP INFO MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
@@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
176 foreach (ScenePresence agent in foundAgents) 176 foreach (ScenePresence agent in foundAgents)
177 { 177 {
178 LLClientView client = agent.ControllingClient as LLClientView; 178 LLClientView client = agent.ControllingClient as LLClientView;
179 179
180 if (client == null) 180 if (client == null)
181 return "This command is only supported for LLClientView"; 181 return "This command is only supported for LLClientView";
182 182
@@ -191,10 +191,10 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
191 } 191 }
192 192
193 protected string GetColumnEntry(string entry, int maxLength, int columnPadding) 193 protected string GetColumnEntry(string entry, int maxLength, int columnPadding)
194 { 194 {
195 return string.Format( 195 return string.Format(
196 "{0,-" + maxLength + "}{1,-" + columnPadding + "}", 196 "{0,-" + maxLength + "}{1,-" + columnPadding + "}",
197 entry.Length > maxLength ? entry.Substring(0, maxLength) : entry, 197 entry.Length > maxLength ? entry.Substring(0, maxLength) : entry,
198 ""); 198 "");
199 } 199 }
200 200
@@ -207,29 +207,29 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
207 { 207 {
208 bool showChildren = false; 208 bool showChildren = false;
209 string pname = ""; 209 string pname = "";
210 210
211 if (showParams.Length > 2 && showParams[2] == "full") 211 if (showParams.Length > 2 && showParams[2] == "full")
212 showChildren = true; 212 showChildren = true;
213 else if (showParams.Length > 3) 213 else if (showParams.Length > 3)
214 pname = showParams[2] + " " + showParams[3]; 214 pname = showParams[2] + " " + showParams[3];
215 215
216 StringBuilder report = new StringBuilder(); 216 StringBuilder report = new StringBuilder();
217 217
218 int columnPadding = 2; 218 int columnPadding = 2;
219 int maxNameLength = 18; 219 int maxNameLength = 18;
220 int maxRegionNameLength = 14; 220 int maxRegionNameLength = 14;
221 int maxTypeLength = 4; 221 int maxTypeLength = 4;
222// int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding; 222// int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
223 223
224 report.Append(GetColumnEntry("User", maxNameLength, columnPadding)); 224 report.Append(GetColumnEntry("User", maxNameLength, columnPadding));
225 report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding)); 225 report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding));
226 report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding)); 226 report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));
227 227
228 report.AppendFormat( 228 report.AppendFormat(
229 "{0,7} {1,7} {2,7} {3,7} {4,7} {5,7} {6,7} {7,7} {8,7} {9,7} {10,7} {11,7}\n", 229 "{0,7} {1,7} {2,7} {3,7} {4,7} {5,7} {6,7} {7,7} {8,7} {9,7} {10,7} {11,7}\n",
230 "Pri 0", 230 "Pri 0",
231 "Pri 1", 231 "Pri 1",
232 "Pri 2", 232 "Pri 2",
233 "Pri 3", 233 "Pri 3",
234 "Pri 4", 234 "Pri 4",
235 "Pri 5", 235 "Pri 5",
@@ -252,16 +252,16 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
252 bool isChild = client.SceneAgent.IsChildAgent; 252 bool isChild = client.SceneAgent.IsChildAgent;
253 if (isChild && !showChildren) 253 if (isChild && !showChildren)
254 return; 254 return;
255 255
256 string name = client.Name; 256 string name = client.Name;
257 if (pname != "" && name != pname) 257 if (pname != "" && name != pname)
258 return; 258 return;
259 259
260 string regionName = scene.RegionInfo.RegionName; 260 string regionName = scene.RegionInfo.RegionName;
261 261
262 report.Append(GetColumnEntry(name, maxNameLength, columnPadding)); 262 report.Append(GetColumnEntry(name, maxNameLength, columnPadding));
263 report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding)); 263 report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding));
264 report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding)); 264 report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));
265 report.AppendLine(((LLClientView)client).EntityUpdateQueue.ToString()); 265 report.AppendLine(((LLClientView)client).EntityUpdateQueue.ToString());
266 } 266 }
267 }); 267 });
@@ -306,17 +306,17 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
306 foreach (ScenePresence agent in foundAgents) 306 foreach (ScenePresence agent in foundAgents)
307 { 307 {
308 LLClientView client = agent.ControllingClient as LLClientView; 308 LLClientView client = agent.ControllingClient as LLClientView;
309 309
310 if (client == null) 310 if (client == null)
311 return "This command is only supported for LLClientView"; 311 return "This command is only supported for LLClientView";
312 312
313 J2KImage[] images = client.ImageManager.GetImages(); 313 J2KImage[] images = client.ImageManager.GetImages();
314 314
315 report.AppendFormat( 315 report.AppendFormat(
316 "In region {0} ({1} agent)\n", 316 "In region {0} ({1} agent)\n",
317 agent.Scene.RegionInfo.RegionName, agent.IsChildAgent ? "child" : "root"); 317 agent.Scene.RegionInfo.RegionName, agent.IsChildAgent ? "child" : "root");
318 report.AppendFormat("Images in queue: {0}\n", images.Length); 318 report.AppendFormat("Images in queue: {0}\n", images.Length);
319 319
320 if (images.Length > 0) 320 if (images.Length > 0)
321 { 321 {
322 report.AppendFormat( 322 report.AppendFormat(
@@ -327,7 +327,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
327 "Start Pkt", 327 "Start Pkt",
328 "Has Asset", 328 "Has Asset",
329 "Decoded"); 329 "Decoded");
330 330
331 foreach (J2KImage image in images) 331 foreach (J2KImage image in images)
332 report.AppendFormat( 332 report.AppendFormat(
333 "{0,36} {1,8} {2,10} {3,10} {4,9} {5,7}\n", 333 "{0,36} {1,8} {2,10} {3,10} {4,9} {5,7}\n",
@@ -337,7 +337,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
337 337
338 return report.ToString(); 338 return report.ToString();
339 } 339 }
340 340
341 /// <summary> 341 /// <summary>
342 /// Generate UDP Queue data report for each client 342 /// Generate UDP Queue data report for each client
343 /// </summary> 343 /// </summary>
@@ -347,16 +347,16 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
347 { 347 {
348 bool showChildren = false; 348 bool showChildren = false;
349 string pname = ""; 349 string pname = "";
350 350
351 if (showParams.Length > 2 && showParams[2] == "full") 351 if (showParams.Length > 2 && showParams[2] == "full")
352 showChildren = true; 352 showChildren = true;
353 else if (showParams.Length > 3) 353 else if (showParams.Length > 3)
354 pname = showParams[2] + " " + showParams[3]; 354 pname = showParams[2] + " " + showParams[3];
355 355
356 StringBuilder report = new StringBuilder(); 356 StringBuilder report = new StringBuilder();
357 357
358 int columnPadding = 2; 358 int columnPadding = 2;
359 int maxNameLength = 18; 359 int maxNameLength = 18;
360 int maxRegionNameLength = 14; 360 int maxRegionNameLength = 14;
361 int maxTypeLength = 4; 361 int maxTypeLength = 4;
362 362
@@ -364,11 +364,11 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
364 = maxNameLength + columnPadding 364 = maxNameLength + columnPadding
365 + maxRegionNameLength + columnPadding 365 + maxRegionNameLength + columnPadding
366 + maxTypeLength + columnPadding; 366 + maxTypeLength + columnPadding;
367 367
368 report.Append(GetColumnEntry("User", maxNameLength, columnPadding)); 368 report.Append(GetColumnEntry("User", maxNameLength, columnPadding));
369 report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding)); 369 report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding));
370 report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding)); 370 report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));
371 371
372 report.AppendFormat( 372 report.AppendFormat(
373 "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7}\n", 373 "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7}\n",
374 "Since", 374 "Since",
@@ -383,7 +383,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
383 "Q Pkts", 383 "Q Pkts",
384 "Q Pkts", 384 "Q Pkts",
385 "Q Pkts"); 385 "Q Pkts");
386 386
387 report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); 387 report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
388 report.AppendFormat( 388 report.AppendFormat(
389 "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7}\n", 389 "{0,7} {1,7} {2,7} {3,7} {4,9} {5,7} {6,7} {7,7} {8,7} {9,7} {10,8} {11,7}\n",
@@ -398,8 +398,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
398 "Cloud", 398 "Cloud",
399 "Task", 399 "Task",
400 "Texture", 400 "Texture",
401 "Asset"); 401 "Asset");
402 402
403 lock (m_scenes) 403 lock (m_scenes)
404 { 404 {
405 foreach (Scene scene in m_scenes.Values) 405 foreach (Scene scene in m_scenes.Values)
@@ -413,7 +413,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
413 bool isChild = client.SceneAgent.IsChildAgent; 413 bool isChild = client.SceneAgent.IsChildAgent;
414 if (isChild && !showChildren) 414 if (isChild && !showChildren)
415 return; 415 return;
416 416
417 string name = client.Name; 417 string name = client.Name;
418 if (pname != "" && name != pname) 418 if (pname != "" && name != pname)
419 return; 419 return;
@@ -424,7 +424,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
424 report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding)); 424 report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding));
425 report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding)); 425 report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));
426 426
427 IStatsCollector stats = (IStatsCollector)client; 427 IStatsCollector stats = (IStatsCollector)client;
428 report.AppendLine(stats.Report()); 428 report.AppendLine(stats.Report());
429 } 429 }
430 }); 430 });
@@ -432,8 +432,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
432 } 432 }
433 433
434 return report.ToString(); 434 return report.ToString();
435 } 435 }
436 436
437 /// <summary> 437 /// <summary>
438 /// Show throttle data 438 /// Show throttle data
439 /// </summary> 439 /// </summary>
@@ -443,28 +443,28 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
443 { 443 {
444 bool showChildren = false; 444 bool showChildren = false;
445 string pname = ""; 445 string pname = "";
446 446
447 if (showParams.Length > 2 && showParams[2] == "full") 447 if (showParams.Length > 2 && showParams[2] == "full")
448 showChildren = true; 448 showChildren = true;
449 else if (showParams.Length > 3) 449 else if (showParams.Length > 3)
450 pname = showParams[2] + " " + showParams[3]; 450 pname = showParams[2] + " " + showParams[3];
451 451
452 StringBuilder report = new StringBuilder(); 452 StringBuilder report = new StringBuilder();
453 453
454 int columnPadding = 2; 454 int columnPadding = 2;
455 int maxNameLength = 18; 455 int maxNameLength = 18;
456 int maxRegionNameLength = 14; 456 int maxRegionNameLength = 14;
457 int maxTypeLength = 4; 457 int maxTypeLength = 4;
458 int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding; 458 int totalInfoFieldsLength = maxNameLength + columnPadding + maxRegionNameLength + columnPadding + maxTypeLength + columnPadding;
459 459
460 report.Append(GetColumnEntry("User", maxNameLength, columnPadding)); 460 report.Append(GetColumnEntry("User", maxNameLength, columnPadding));
461 report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding)); 461 report.Append(GetColumnEntry("Region", maxRegionNameLength, columnPadding));
462 report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding)); 462 report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));
463 463
464 report.AppendFormat( 464 report.AppendFormat(
465 "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n", 465 "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n",
466 "Max", 466 "Max",
467 "Target", 467 "Target",
468 "Actual", 468 "Actual",
469 "Resend", 469 "Resend",
470 "Land", 470 "Land",
@@ -472,8 +472,8 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
472 "Cloud", 472 "Cloud",
473 "Task", 473 "Task",
474 "Texture", 474 "Texture",
475 "Asset"); 475 "Asset");
476 476
477 report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", ""); 477 report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
478 report.AppendFormat( 478 report.AppendFormat(
479 "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n", 479 "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n",
@@ -486,10 +486,10 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
486 "kb/s", 486 "kb/s",
487 "kb/s", 487 "kb/s",
488 "kb/s", 488 "kb/s",
489 "kb/s"); 489 "kb/s");
490 490
491 report.AppendLine(); 491 report.AppendLine();
492 492
493 lock (m_scenes) 493 lock (m_scenes)
494 { 494 {
495 foreach (Scene scene in m_scenes.Values) 495 foreach (Scene scene in m_scenes.Values)
@@ -504,25 +504,25 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
504 bool isChild = client.SceneAgent.IsChildAgent; 504 bool isChild = client.SceneAgent.IsChildAgent;
505 if (isChild && !showChildren) 505 if (isChild && !showChildren)
506 return; 506 return;
507 507
508 string name = client.Name; 508 string name = client.Name;
509 if (pname != "" && name != pname) 509 if (pname != "" && name != pname)
510 return; 510 return;
511 511
512 string regionName = scene.RegionInfo.RegionName; 512 string regionName = scene.RegionInfo.RegionName;
513 513
514 LLUDPClient llUdpClient = llClient.UDPClient; 514 LLUDPClient llUdpClient = llClient.UDPClient;
515 ClientInfo ci = llUdpClient.GetClientInfo(); 515 ClientInfo ci = llUdpClient.GetClientInfo();
516 516
517 report.Append(GetColumnEntry(name, maxNameLength, columnPadding)); 517 report.Append(GetColumnEntry(name, maxNameLength, columnPadding));
518 report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding)); 518 report.Append(GetColumnEntry(regionName, maxRegionNameLength, columnPadding));
519 report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding)); 519 report.Append(GetColumnEntry(isChild ? "Cd" : "Rt", maxTypeLength, columnPadding));
520 520
521 report.AppendFormat( 521 report.AppendFormat(
522 "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n", 522 "{0,8} {1,8} {2,7} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7}\n",
523 ci.maxThrottle > 0 ? ((ci.maxThrottle * 8) / 1000).ToString() : "-", 523 ci.maxThrottle > 0 ? ((ci.maxThrottle * 8) / 1000).ToString() : "-",
524 llUdpClient.FlowThrottle.AdaptiveEnabled 524 llUdpClient.FlowThrottle.AdaptiveEnabled
525 ? ((ci.targetThrottle * 8) / 1000).ToString() 525 ? ((ci.targetThrottle * 8) / 1000).ToString()
526 : (llUdpClient.FlowThrottle.TotalDripRequest * 8 / 1000).ToString(), 526 : (llUdpClient.FlowThrottle.TotalDripRequest * 8 / 1000).ToString(),
527 (ci.totalThrottle * 8) / 1000, 527 (ci.totalThrottle * 8) / 1000,
528 (ci.resendThrottle * 8) / 1000, 528 (ci.resendThrottle * 8) / 1000,
@@ -538,7 +538,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
538 } 538 }
539 539
540 return report.ToString(); 540 return report.ToString();
541 } 541 }
542 542
543 /// <summary> 543 /// <summary>
544 /// Show client stats data 544 /// Show client stats data
@@ -568,20 +568,20 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
568 string childAgentStatus; 568 string childAgentStatus;
569 569
570 if (llClient.SceneAgent != null) 570 if (llClient.SceneAgent != null)
571 childAgentStatus = llClient.SceneAgent.IsChildAgent ? "N" : "Y"; 571 childAgentStatus = llClient.SceneAgent.IsChildAgent ? "N" : "Y";
572 else 572 else
573 childAgentStatus = "Off!"; 573 childAgentStatus = "Off!";
574 574
575 m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", 575 m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}",
576 scene.RegionInfo.RegionName, llClient.Name, 576 scene.RegionInfo.RegionName, llClient.Name,
577 childAgentStatus, 577 childAgentStatus,
578 (DateTime.Now - cinfo.StartedTime).Minutes, 578 (DateTime.Now - cinfo.StartedTime).Minutes,
579 avg_reqs, 579 avg_reqs,
580 string.Format( 580 string.Format(
581 "{0} ({1:0.00}%)", 581 "{0} ({1:0.00}%)",
582 llClient.TotalAgentUpdates, 582 llClient.TotalAgentUpdates,
583 cinfo.SyncRequests.ContainsKey("AgentUpdate") 583 cinfo.SyncRequests.ContainsKey("AgentUpdate")
584 ? (float)cinfo.SyncRequests["AgentUpdate"] / llClient.TotalAgentUpdates * 100 584 ? (float)cinfo.SyncRequests["AgentUpdate"] / llClient.TotalAgentUpdates * 100
585 : 0)); 585 : 0));
586 } 586 }
587 }); 587 });