aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-04 19:09:56 +0000
committerJustin Clarke Casey2008-04-04 19:09:56 +0000
commit57afbdbdbdfea90d5e27ea37ced2a72219cce4e9 (patch)
tree42dc3bfed6e5b0bef52aace3a41677faa8412db9
parentmake AssetBase use Properties instead of fields. This probably (diff)
downloadopensim-SC_OLD-57afbdbdbdfea90d5e27ea37ced2a72219cce4e9.zip
opensim-SC_OLD-57afbdbdbdfea90d5e27ea37ced2a72219cce4e9.tar.gz
opensim-SC_OLD-57afbdbdbdfea90d5e27ea37ced2a72219cce4e9.tar.bz2
opensim-SC_OLD-57afbdbdbdfea90d5e27ea37ced2a72219cce4e9.tar.xz
From: Kurt Taylor <krtaylor@us.ibm.com>
Patch to remove commented NotImpemented calls from within implemented script functions
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs21
3 files changed, 7 insertions, 26 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index ed2fcf4..4d37e74 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -241,9 +241,7 @@ namespace OpenSim.Framework.Communications.Cache
241 /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param> 241 /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param>
242 public void GetAsset(LLUUID assetId, AssetRequestCallback callback, bool isTexture) 242 public void GetAsset(LLUUID assetId, AssetRequestCallback callback, bool isTexture)
243 { 243 {
244#if DEBUG
245 //m_log.DebugFormat("[ASSET CACHE]: Requesting {0} {1}", isTexture ? "texture" : "asset", assetId); 244 //m_log.DebugFormat("[ASSET CACHE]: Requesting {0} {1}", isTexture ? "texture" : "asset", assetId);
246#endif
247 245
248 AssetBase asset; 246 AssetBase asset;
249 247
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 0879357..16da516 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -384,7 +384,7 @@ namespace OpenSim.Region.Environment.Scenes
384 else 384 else
385 { 385 {
386 m_log.ErrorFormat( 386 m_log.ErrorFormat(
387 "[PRIMINVENTORY]: " + 387 "[PRIM INVENTORY]: " +
388 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 388 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
389 itemID, Name, UUID); 389 itemID, Name, UUID);
390 } 390 }
@@ -400,6 +400,10 @@ namespace OpenSim.Region.Environment.Scenes
400 /// <param name="localID"></param> 400 /// <param name="localID"></param>
401 public bool GetInventoryFileName(IClientAPI client, uint localID) 401 public bool GetInventoryFileName(IClientAPI client, uint localID)
402 { 402 {
403// m_log.DebugFormat(
404// "[PRIM INVENTORY]: Received request from client {0} for inventory file name of {1}, {2}",
405// client.AgentId, Name, UUID);
406
403 if (m_inventorySerial > 0) 407 if (m_inventorySerial > 0)
404 { 408 {
405 client.SendTaskInventory(m_uuid, (short)m_inventorySerial, 409 client.SendTaskInventory(m_uuid, (short)m_inventorySerial,
@@ -455,8 +459,8 @@ namespace OpenSim.Region.Environment.Scenes
455 459
456 fileData = Helpers.StringToField(invString.BuildString); 460 fileData = Helpers.StringToField(invString.BuildString);
457 461
458 // m_log.InfoFormat( 462// m_log.DebugFormat(
459 // "[PRIMINVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData)); 463// "[PRIM INVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData));
460 464
461 if (fileData.Length > 2) 465 if (fileData.Length > 2)
462 { 466 {
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 391fcf9..76be7cf 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -376,7 +376,6 @@ namespace OpenSim.Region.ScriptEngine.Common
376 m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host); 376 m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host);
377 377
378 return; 378 return;
379 // NotImplemented("llSensor");
380 } 379 }
381 380
382 public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate) 381 public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate)
@@ -393,7 +392,6 @@ namespace OpenSim.Region.ScriptEngine.Common
393 392
394 m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host); 393 m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host);
395 return; 394 return;
396 // NotImplemented("llSensorRepeat");
397 } 395 }
398 396
399 public void llSensorRemove() 397 public void llSensorRemove()
@@ -401,7 +399,6 @@ namespace OpenSim.Region.ScriptEngine.Common
401 m_host.AddScriptLPS(1); 399 m_host.AddScriptLPS(1);
402 m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.UnSetSenseRepeaterEvents(m_localID, m_itemID); 400 m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.UnSetSenseRepeaterEvents(m_localID, m_itemID);
403 return; 401 return;
404 // NotImplemented("llSensorRemove");
405 } 402 }
406 403
407 public string resolveName(LLUUID objecUUID) 404 public string resolveName(LLUUID objecUUID)
@@ -444,7 +441,6 @@ namespace OpenSim.Region.ScriptEngine.Common
444 } 441 }
445 else 442 else
446 return String.Empty; 443 return String.Empty;
447 //NotImplemented("llDetectedName");
448 } 444 }
449 445
450 public LLUUID uuidDetectedKey(int number) 446 public LLUUID uuidDetectedKey(int number)
@@ -532,8 +528,6 @@ namespace OpenSim.Region.ScriptEngine.Common
532 return new LSL_Types.Vector3(0, 0, 0); 528 return new LSL_Types.Vector3(0, 0, 0);
533 529
534 return new LSL_Types.Vector3(SensedObject.AbsolutePosition.X,SensedObject.AbsolutePosition.Y,SensedObject.AbsolutePosition.Z); 530 return new LSL_Types.Vector3(SensedObject.AbsolutePosition.X,SensedObject.AbsolutePosition.Y,SensedObject.AbsolutePosition.Z);
535
536 //NotImplemented("llDetectedPos");
537 } 531 }
538 532
539 public LSL_Types.Vector3 llDetectedVel(int number) 533 public LSL_Types.Vector3 llDetectedVel(int number)
@@ -544,7 +538,6 @@ namespace OpenSim.Region.ScriptEngine.Common
544 return new LSL_Types.Vector3(0, 0, 0); 538 return new LSL_Types.Vector3(0, 0, 0);
545 539
546 return new LSL_Types.Vector3(SensedObject.Velocity.X, SensedObject.Velocity.Y, SensedObject.Velocity.Z); 540 return new LSL_Types.Vector3(SensedObject.Velocity.X, SensedObject.Velocity.Y, SensedObject.Velocity.Z);
547 // NotImplemented("llDetectedVel");
548 // return new LSL_Types.Vector3(); 541 // return new LSL_Types.Vector3();
549 } 542 }
550 543
@@ -1107,14 +1100,12 @@ namespace OpenSim.Region.ScriptEngine.Common
1107 { 1100 {
1108 m_host.AddScriptLPS(1); 1101 m_host.AddScriptLPS(1);
1109 m_host.MoveToTarget(new LLVector3((float)target.x, (float)target.y, (float)target.z), (float)tau); 1102 m_host.MoveToTarget(new LLVector3((float)target.x, (float)target.y, (float)target.z), (float)tau);
1110 //NotImplemented("llMoveToTarget");
1111 } 1103 }
1112 1104
1113 public void llStopMoveToTarget() 1105 public void llStopMoveToTarget()
1114 { 1106 {
1115 m_host.AddScriptLPS(1); 1107 m_host.AddScriptLPS(1);
1116 m_host.StopMoveToTarget(); 1108 m_host.StopMoveToTarget();
1117 //NotImplemented("llStopMoveToTarget");
1118 } 1109 }
1119 1110
1120 public void llApplyImpulse(LSL_Types.Vector3 force, int local) 1111 public void llApplyImpulse(LSL_Types.Vector3 force, int local)
@@ -1235,7 +1226,6 @@ namespace OpenSim.Region.ScriptEngine.Common
1235 { 1226 {
1236 m_host.AddScriptLPS(1); 1227 m_host.AddScriptLPS(1);
1237 m_host.SendSound(sound, volume, false, 1); 1228 m_host.SendSound(sound, volume, false, 1);
1238 //NotImplemented("llLoopSound");
1239 } 1229 }
1240 1230
1241 public void llLoopSoundMaster(string sound, double volume) 1231 public void llLoopSoundMaster(string sound, double volume)
@@ -1266,7 +1256,6 @@ namespace OpenSim.Region.ScriptEngine.Common
1266 { 1256 {
1267 m_host.AddScriptLPS(1); 1257 m_host.AddScriptLPS(1);
1268 m_host.SendSound(LLUUID.Zero.ToString(), 1.0, false, 2); 1258 m_host.SendSound(LLUUID.Zero.ToString(), 1.0, false, 2);
1269 //NotImplemented("llStopSound");
1270 } 1259 }
1271 1260
1272 public void llPreloadSound(string sound) 1261 public void llPreloadSound(string sound)
@@ -1603,7 +1592,6 @@ namespace OpenSim.Region.ScriptEngine.Common
1603 m_host.AngularVelocity = new LLVector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); 1592 m_host.AngularVelocity = new LLVector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate));
1604 m_host.ScheduleTerseUpdate(); 1593 m_host.ScheduleTerseUpdate();
1605 m_host.SendTerseUpdateToAllClients(); 1594 m_host.SendTerseUpdateToAllClients();
1606 //NotImplemented("llTargetOmega");
1607 } 1595 }
1608 1596
1609 public int llGetStartParameter() 1597 public int llGetStartParameter()
@@ -2822,7 +2810,6 @@ namespace OpenSim.Region.ScriptEngine.Common
2822 { 2810 {
2823 m_host.AddScriptLPS(1); 2811 m_host.AddScriptLPS(1);
2824 m_host.AdjustSoundGain(volume); 2812 m_host.AdjustSoundGain(volume);
2825 //NotImplemented("llAdjustSoundVolume");
2826 } 2813 }
2827 2814
2828 public void llSetSoundQueueing(int queue) 2815 public void llSetSoundQueueing(int queue)
@@ -3389,7 +3376,6 @@ namespace OpenSim.Region.ScriptEngine.Common
3389 buts[i] = buttons.Data[i].ToString(); 3376 buts[i] = buttons.Data[i].ToString();
3390 } 3377 }
3391 World.SendDialogToUser(av, m_host.Name, m_host.UUID, m_host.OwnerID, message, new LLUUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); 3378 World.SendDialogToUser(av, m_host.Name, m_host.UUID, m_host.OwnerID, message, new LLUUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts);
3392 //NotImplemented("llDialog");
3393 } 3379 }
3394 3380
3395 public void llVolumeDetect(int detect) 3381 public void llVolumeDetect(int detect)
@@ -4323,7 +4309,6 @@ namespace OpenSim.Region.ScriptEngine.Common
4323 } 4309 }
4324 } 4310 }
4325 return -1; 4311 return -1;
4326 //NotImplemented("llGetInventoryPermMask");
4327 } 4312 }
4328 4313
4329 public void llSetInventoryPermMask(string item, int mask, int value) 4314 public void llSetInventoryPermMask(string item, int mask, int value)
@@ -4343,7 +4328,6 @@ namespace OpenSim.Region.ScriptEngine.Common
4343 } 4328 }
4344 } 4329 }
4345 llSay(0, "No item name '" + item + "'"); 4330 llSay(0, "No item name '" + item + "'");
4346 //NotImplemented("llGetInventoryCreator");
4347 return String.Empty; 4331 return String.Empty;
4348 } 4332 }
4349 4333
@@ -4510,7 +4494,6 @@ namespace OpenSim.Region.ScriptEngine.Common
4510 land.parcelAccessList.Add(entry); 4494 land.parcelAccessList.Add(entry);
4511 } 4495 }
4512 } 4496 }
4513 //NotImplemented("llAddToLandBanList");
4514 } 4497 }
4515 4498
4516 public void llRemoveFromLandPassList(string avatar) 4499 public void llRemoveFromLandPassList(string avatar)
@@ -4532,7 +4515,6 @@ namespace OpenSim.Region.ScriptEngine.Common
4532 } 4515 }
4533 } 4516 }
4534 } 4517 }
4535 //NotImplemented("llRemoveFromLandPassList");
4536 } 4518 }
4537 4519
4538 public void llRemoveFromLandBanList(string avatar) 4520 public void llRemoveFromLandBanList(string avatar)
@@ -4554,7 +4536,6 @@ namespace OpenSim.Region.ScriptEngine.Common
4554 } 4536 }
4555 } 4537 }
4556 } 4538 }
4557 //NotImplemented("llRemoveFromLandPassList");
4558 } 4539 }
4559 4540
4560 public void llSetCameraParams(LSL_Types.list rules) 4541 public void llSetCameraParams(LSL_Types.list rules)
@@ -4754,8 +4735,6 @@ namespace OpenSim.Region.ScriptEngine.Common
4754 } 4735 }
4755 } 4736 }
4756 } 4737 }
4757
4758 //NotImplemented("llGetParcelPrimCount");
4759 return 0; 4738 return 0;
4760 } 4739 }
4761 4740