OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

From: Kurt Taylor <krtaylor@us.ibm.com> 

Patch to remove commented NotImpemented calls from within implemented script functions
0.6.0-stable
Justin Clarke Casey 2008-04-04 19:09:56 +00:00
parent f010d398cf
commit 57afbdbdbd
3 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -241,9 +241,7 @@ namespace OpenSim.Framework.Communications.Cache
/// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param> /// If the asset was not found this is still called with the asset UUID but with a null asset data reference</param>
public void GetAsset(LLUUID assetId, AssetRequestCallback callback, bool isTexture) public void GetAsset(LLUUID assetId, AssetRequestCallback callback, bool isTexture)
{ {
#if DEBUG
//m_log.DebugFormat("[ASSET CACHE]: Requesting {0} {1}", isTexture ? "texture" : "asset", assetId); //m_log.DebugFormat("[ASSET CACHE]: Requesting {0} {1}", isTexture ? "texture" : "asset", assetId);
#endif
AssetBase asset; AssetBase asset;

10
OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
View File

@ -384,7 +384,7 @@ namespace OpenSim.Region.Environment.Scenes
else else
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[PRIMINVENTORY]: " + "[PRIM INVENTORY]: " +
"Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory", "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
itemID, Name, UUID); itemID, Name, UUID);
} }
@ -400,6 +400,10 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="localID"></param> /// <param name="localID"></param>
public bool GetInventoryFileName(IClientAPI client, uint localID) public bool GetInventoryFileName(IClientAPI client, uint localID)
{ {
// m_log.DebugFormat(
// "[PRIM INVENTORY]: Received request from client {0} for inventory file name of {1}, {2}",
// client.AgentId, Name, UUID);
if (m_inventorySerial > 0) if (m_inventorySerial > 0)
{ {
client.SendTaskInventory(m_uuid, (short)m_inventorySerial, client.SendTaskInventory(m_uuid, (short)m_inventorySerial,
@ -455,8 +459,8 @@ namespace OpenSim.Region.Environment.Scenes
fileData = Helpers.StringToField(invString.BuildString); fileData = Helpers.StringToField(invString.BuildString);
// m_log.InfoFormat( // m_log.DebugFormat(
// "[PRIMINVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData)); // "[PRIM INVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData));
if (fileData.Length > 2) if (fileData.Length > 2)
{ {

21
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -376,7 +376,6 @@ namespace OpenSim.Region.ScriptEngine.Common
m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host); m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host);
return; return;
// NotImplemented("llSensor");
} }
public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate) public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate)
@ -393,7 +392,6 @@ namespace OpenSim.Region.ScriptEngine.Common
m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host); m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host);
return; return;
// NotImplemented("llSensorRepeat");
} }
public void llSensorRemove() public void llSensorRemove()
@ -401,7 +399,6 @@ namespace OpenSim.Region.ScriptEngine.Common
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.UnSetSenseRepeaterEvents(m_localID, m_itemID); m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.UnSetSenseRepeaterEvents(m_localID, m_itemID);
return; return;
// NotImplemented("llSensorRemove");
} }
public string resolveName(LLUUID objecUUID) public string resolveName(LLUUID objecUUID)
@ -444,7 +441,6 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
else else
return String.Empty; return String.Empty;
//NotImplemented("llDetectedName");
} }
public LLUUID uuidDetectedKey(int number) public LLUUID uuidDetectedKey(int number)
@ -532,8 +528,6 @@ namespace OpenSim.Region.ScriptEngine.Common
return new LSL_Types.Vector3(0, 0, 0); return new LSL_Types.Vector3(0, 0, 0);
return new LSL_Types.Vector3(SensedObject.AbsolutePosition.X,SensedObject.AbsolutePosition.Y,SensedObject.AbsolutePosition.Z); return new LSL_Types.Vector3(SensedObject.AbsolutePosition.X,SensedObject.AbsolutePosition.Y,SensedObject.AbsolutePosition.Z);
//NotImplemented("llDetectedPos");
} }
public LSL_Types.Vector3 llDetectedVel(int number) public LSL_Types.Vector3 llDetectedVel(int number)
@ -544,7 +538,6 @@ namespace OpenSim.Region.ScriptEngine.Common
return new LSL_Types.Vector3(0, 0, 0); return new LSL_Types.Vector3(0, 0, 0);
return new LSL_Types.Vector3(SensedObject.Velocity.X, SensedObject.Velocity.Y, SensedObject.Velocity.Z); return new LSL_Types.Vector3(SensedObject.Velocity.X, SensedObject.Velocity.Y, SensedObject.Velocity.Z);
// NotImplemented("llDetectedVel");
// return new LSL_Types.Vector3(); // return new LSL_Types.Vector3();
} }
@ -1107,14 +1100,12 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
m_host.MoveToTarget(new LLVector3((float)target.x, (float)target.y, (float)target.z), (float)tau); m_host.MoveToTarget(new LLVector3((float)target.x, (float)target.y, (float)target.z), (float)tau);
//NotImplemented("llMoveToTarget");
} }
public void llStopMoveToTarget() public void llStopMoveToTarget()
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
m_host.StopMoveToTarget(); m_host.StopMoveToTarget();
//NotImplemented("llStopMoveToTarget");
} }
public void llApplyImpulse(LSL_Types.Vector3 force, int local) public void llApplyImpulse(LSL_Types.Vector3 force, int local)
@ -1235,7 +1226,6 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
m_host.SendSound(sound, volume, false, 1); m_host.SendSound(sound, volume, false, 1);
//NotImplemented("llLoopSound");
} }
public void llLoopSoundMaster(string sound, double volume) public void llLoopSoundMaster(string sound, double volume)
@ -1266,7 +1256,6 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
m_host.SendSound(LLUUID.Zero.ToString(), 1.0, false, 2); m_host.SendSound(LLUUID.Zero.ToString(), 1.0, false, 2);
//NotImplemented("llStopSound");
} }
public void llPreloadSound(string sound) public void llPreloadSound(string sound)
@ -1603,7 +1592,6 @@ namespace OpenSim.Region.ScriptEngine.Common
m_host.AngularVelocity = new LLVector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate)); m_host.AngularVelocity = new LLVector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate));
m_host.ScheduleTerseUpdate(); m_host.ScheduleTerseUpdate();
m_host.SendTerseUpdateToAllClients(); m_host.SendTerseUpdateToAllClients();
//NotImplemented("llTargetOmega");
} }
public int llGetStartParameter() public int llGetStartParameter()
@ -2822,7 +2810,6 @@ namespace OpenSim.Region.ScriptEngine.Common
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
m_host.AdjustSoundGain(volume); m_host.AdjustSoundGain(volume);
//NotImplemented("llAdjustSoundVolume");
} }
public void llSetSoundQueueing(int queue) public void llSetSoundQueueing(int queue)
@ -3389,7 +3376,6 @@ namespace OpenSim.Region.ScriptEngine.Common
buts[i] = buttons.Data[i].ToString(); buts[i] = buttons.Data[i].ToString();
} }
World.SendDialogToUser(av, m_host.Name, m_host.UUID, m_host.OwnerID, message, new LLUUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts); World.SendDialogToUser(av, m_host.Name, m_host.UUID, m_host.OwnerID, message, new LLUUID("00000000-0000-2222-3333-100000001000"), chat_channel, buts);
//NotImplemented("llDialog");
} }
public void llVolumeDetect(int detect) public void llVolumeDetect(int detect)
@ -4323,7 +4309,6 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
} }
return -1; return -1;
//NotImplemented("llGetInventoryPermMask");
} }
public void llSetInventoryPermMask(string item, int mask, int value) public void llSetInventoryPermMask(string item, int mask, int value)
@ -4343,7 +4328,6 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
} }
llSay(0, "No item name '" + item + "'"); llSay(0, "No item name '" + item + "'");
//NotImplemented("llGetInventoryCreator");
return String.Empty; return String.Empty;
} }
@ -4510,7 +4494,6 @@ namespace OpenSim.Region.ScriptEngine.Common
land.parcelAccessList.Add(entry); land.parcelAccessList.Add(entry);
} }
} }
//NotImplemented("llAddToLandBanList");
} }
public void llRemoveFromLandPassList(string avatar) public void llRemoveFromLandPassList(string avatar)
@ -4532,7 +4515,6 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
} }
} }
//NotImplemented("llRemoveFromLandPassList");
} }
public void llRemoveFromLandBanList(string avatar) public void llRemoveFromLandBanList(string avatar)
@ -4554,7 +4536,6 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
} }
} }
//NotImplemented("llRemoveFromLandPassList");
} }
public void llSetCameraParams(LSL_Types.list rules) public void llSetCameraParams(LSL_Types.list rules)
@ -4754,8 +4735,6 @@ namespace OpenSim.Region.ScriptEngine.Common
} }
} }
} }
//NotImplemented("llGetParcelPrimCount");
return 0; return 0;
} }