diff options
author | Adam Frisby | 2008-01-15 02:09:55 +0000 |
---|---|---|
committer | Adam Frisby | 2008-01-15 02:09:55 +0000 |
commit | b25f9f322cdbcde7fd8c043137bf07992e5ef318 (patch) | |
tree | 7c1a5115b2849dfe388b825dd271271d347f9574 /OpenSim/Region/ScriptEngine/Common | |
parent | Set svn:eol-style. (diff) | |
download | opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.zip opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.gz opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.bz2 opensim-SC-b25f9f322cdbcde7fd8c043137bf07992e5ef318.tar.xz |
* Mother of all commits:
* Cleaned up copyright notices in AssemblyInfo.cs's
* Added Copyright headers to a bunch of files missing them
* Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
9 files changed, 67 insertions, 39 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/Executor.cs b/OpenSim/Region/ScriptEngine/Common/Executor.cs index 1805e38..df28d7d 100644 --- a/OpenSim/Region/ScriptEngine/Common/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Common/Executor.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
88 | 88 | ||
89 | //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args); | 89 | //type.InvokeMember(EventName, BindingFlags.InvokeMethod, null, m_Script, args); |
90 | 90 | ||
91 | //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \"" + EventName + "\""); | 91 | //Console.WriteLine("ScriptEngine Executor.ExecuteEvent: \String.Empty + EventName + "\String.Empty); |
92 | 92 | ||
93 | if (Events.ContainsKey(EventName) == false) | 93 | if (Events.ContainsKey(EventName) == false) |
94 | { | 94 | { |
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
112 | 112 | ||
113 | if (ev == null) // No event by that name! | 113 | if (ev == null) // No event by that name! |
114 | { | 114 | { |
115 | //Console.WriteLine("ScriptEngine Can not find any event named: \"" + EventName + "\""); | 115 | //Console.WriteLine("ScriptEngine Can not find any event named: \String.Empty + EventName + "\String.Empty); |
116 | return; | 116 | return; |
117 | } | 117 | } |
118 | 118 | ||
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs index 33e5c68..5149f3a 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BaseClass.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
79 | 79 | ||
80 | 80 | ||
81 | public LSL_BuiltIn_Commands_Interface m_LSL_Functions; | 81 | public LSL_BuiltIn_Commands_Interface m_LSL_Functions; |
82 | private string _Source = ""; | 82 | private string _Source = String.Empty; |
83 | public string Source | 83 | public string Source |
84 | { | 84 | { |
85 | get | 85 | get |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 4cceb5f..1400617 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -297,7 +297,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
297 | 297 | ||
298 | public int llListen(int channelID, string name, string ID, string msg) | 298 | public int llListen(int channelID, string name, string ID, string msg) |
299 | { | 299 | { |
300 | if (ID == "") | 300 | if (ID == String.Empty) |
301 | { | 301 | { |
302 | ID = LLUUID.Zero.ToString(); | 302 | ID = LLUUID.Zero.ToString(); |
303 | } | 303 | } |
@@ -338,19 +338,19 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
338 | public string llDetectedName(int number) | 338 | public string llDetectedName(int number) |
339 | { | 339 | { |
340 | NotImplemented("llDetectedName"); | 340 | NotImplemented("llDetectedName"); |
341 | return ""; | 341 | return String.Empty; |
342 | } | 342 | } |
343 | 343 | ||
344 | public string llDetectedKey(int number) | 344 | public string llDetectedKey(int number) |
345 | { | 345 | { |
346 | NotImplemented("llDetectedKey"); | 346 | NotImplemented("llDetectedKey"); |
347 | return ""; | 347 | return String.Empty; |
348 | } | 348 | } |
349 | 349 | ||
350 | public string llDetectedOwner(int number) | 350 | public string llDetectedOwner(int number) |
351 | { | 351 | { |
352 | NotImplemented("llDetectedOwner"); | 352 | NotImplemented("llDetectedOwner"); |
353 | return ""; | 353 | return String.Empty; |
354 | } | 354 | } |
355 | 355 | ||
356 | public int llDetectedType(int number) | 356 | public int llDetectedType(int number) |
@@ -693,7 +693,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
693 | return texface.TextureID.ToString(); | 693 | return texface.TextureID.ToString(); |
694 | } | 694 | } |
695 | NotImplemented("llGetTexture"); | 695 | NotImplemented("llGetTexture"); |
696 | return ""; | 696 | return String.Empty; |
697 | } | 697 | } |
698 | 698 | ||
699 | public void llSetPos(LSL_Types.Vector3 pos) | 699 | public void llSetPos(LSL_Types.Vector3 pos) |
@@ -1175,7 +1175,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1175 | public string llGetPermissionsKey() | 1175 | public string llGetPermissionsKey() |
1176 | { | 1176 | { |
1177 | NotImplemented("llGetPermissionsKey"); | 1177 | NotImplemented("llGetPermissionsKey"); |
1178 | return ""; | 1178 | return String.Empty; |
1179 | } | 1179 | } |
1180 | 1180 | ||
1181 | public int llGetPermissions() | 1181 | public int llGetPermissions() |
@@ -1336,7 +1336,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1336 | public string llGetInventoryName(int type, int number) | 1336 | public string llGetInventoryName(int type, int number) |
1337 | { | 1337 | { |
1338 | NotImplemented("llGetInventoryName"); | 1338 | NotImplemented("llGetInventoryName"); |
1339 | return ""; | 1339 | return String.Empty; |
1340 | } | 1340 | } |
1341 | 1341 | ||
1342 | public void llSetScriptState(string name, int run) | 1342 | public void llSetScriptState(string name, int run) |
@@ -1378,13 +1378,13 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1378 | public string llRequestAgentData(string id, int data) | 1378 | public string llRequestAgentData(string id, int data) |
1379 | { | 1379 | { |
1380 | NotImplemented("llRequestAgentData"); | 1380 | NotImplemented("llRequestAgentData"); |
1381 | return ""; | 1381 | return String.Empty; |
1382 | } | 1382 | } |
1383 | 1383 | ||
1384 | public string llRequestInventoryData(string name) | 1384 | public string llRequestInventoryData(string name) |
1385 | { | 1385 | { |
1386 | NotImplemented("llRequestInventoryData"); | 1386 | NotImplemented("llRequestInventoryData"); |
1387 | return ""; | 1387 | return String.Empty; |
1388 | } | 1388 | } |
1389 | 1389 | ||
1390 | public void llSetDamage(double damage) | 1390 | public void llSetDamage(double damage) |
@@ -1473,7 +1473,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1473 | public string llGetAnimation(string id) | 1473 | public string llGetAnimation(string id) |
1474 | { | 1474 | { |
1475 | NotImplemented("llGetAnimation"); | 1475 | NotImplemented("llGetAnimation"); |
1476 | return ""; | 1476 | return String.Empty; |
1477 | } | 1477 | } |
1478 | 1478 | ||
1479 | public void llResetScript() | 1479 | public void llResetScript() |
@@ -1495,7 +1495,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1495 | 1495 | ||
1496 | public string llGetScriptName() | 1496 | public string llGetScriptName() |
1497 | { | 1497 | { |
1498 | return ""; | 1498 | return String.Empty; |
1499 | } | 1499 | } |
1500 | 1500 | ||
1501 | public int llGetNumberOfSides() | 1501 | public int llGetNumberOfSides() |
@@ -1534,7 +1534,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1534 | 1534 | ||
1535 | public string llGetInventoryKey(string name) | 1535 | public string llGetInventoryKey(string name) |
1536 | { | 1536 | { |
1537 | return ""; | 1537 | return String.Empty; |
1538 | } | 1538 | } |
1539 | 1539 | ||
1540 | public void llAllowInventoryDrop(int add) | 1540 | public void llAllowInventoryDrop(int add) |
@@ -1592,7 +1592,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1592 | public string llGetOwnerKey(string id) | 1592 | public string llGetOwnerKey(string id) |
1593 | { | 1593 | { |
1594 | NotImplemented("llGetOwnerKey"); | 1594 | NotImplemented("llGetOwnerKey"); |
1595 | return ""; | 1595 | return String.Empty; |
1596 | } | 1596 | } |
1597 | 1597 | ||
1598 | public LSL_Types.Vector3 llGetCenterOfMass() | 1598 | public LSL_Types.Vector3 llGetCenterOfMass() |
@@ -1610,14 +1610,14 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1610 | // s = 1; | 1610 | // s = 1; |
1611 | //int c = 0; | 1611 | //int c = 0; |
1612 | //LSL_Types.list chunk = new LSL_Types.list(); | 1612 | //LSL_Types.list chunk = new LSL_Types.list(); |
1613 | //string chunkString = ""; | 1613 | //string chunkString = String.Empty; |
1614 | //foreach (string element in src) | 1614 | //foreach (string element in src) |
1615 | //{ | 1615 | //{ |
1616 | // c++; | 1616 | // c++; |
1617 | // if (c > s) | 1617 | // if (c > s) |
1618 | // { | 1618 | // { |
1619 | // sorted.Add(chunkString, chunk); | 1619 | // sorted.Add(chunkString, chunk); |
1620 | // chunkString = ""; | 1620 | // chunkString = String.Empty; |
1621 | // chunk = new LSL_Types.list(); | 1621 | // chunk = new LSL_Types.list(); |
1622 | // c = 0; | 1622 | // c = 0; |
1623 | // } | 1623 | // } |
@@ -1693,7 +1693,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1693 | } | 1693 | } |
1694 | if (index >= src.Length) | 1694 | if (index >= src.Length) |
1695 | { | 1695 | { |
1696 | return ""; | 1696 | return String.Empty; |
1697 | } | 1697 | } |
1698 | return src.Data[index].ToString(); | 1698 | return src.Data[index].ToString(); |
1699 | } | 1699 | } |
@@ -1814,7 +1814,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1814 | 1814 | ||
1815 | public string llList2CSV(LSL_Types.list src) | 1815 | public string llList2CSV(LSL_Types.list src) |
1816 | { | 1816 | { |
1817 | string ret = ""; | 1817 | string ret = String.Empty; |
1818 | foreach (object o in src.Data) | 1818 | foreach (object o in src.Data) |
1819 | { | 1819 | { |
1820 | ret = ret + o.ToString() + ","; | 1820 | ret = ret + o.ToString() + ","; |
@@ -1968,7 +1968,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
1968 | public string llKey2Name(string id) | 1968 | public string llKey2Name(string id) |
1969 | { | 1969 | { |
1970 | NotImplemented("llKey2Name"); | 1970 | NotImplemented("llKey2Name"); |
1971 | return ""; | 1971 | return String.Empty; |
1972 | } | 1972 | } |
1973 | 1973 | ||
1974 | public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) | 1974 | public void llSetTextureAnim(int mode, int face, int sizex, int sizey, double start, double length, double rate) |
@@ -2006,7 +2006,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2006 | public string llGetNotecardLine(string name, int line) | 2006 | public string llGetNotecardLine(string name, int line) |
2007 | { | 2007 | { |
2008 | NotImplemented("llGetNotecardLine"); | 2008 | NotImplemented("llGetNotecardLine"); |
2009 | return ""; | 2009 | return String.Empty; |
2010 | } | 2010 | } |
2011 | 2011 | ||
2012 | public LSL_Types.Vector3 llGetAgentSize(string id) | 2012 | public LSL_Types.Vector3 llGetAgentSize(string id) |
@@ -2257,7 +2257,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2257 | if (AVID != LLUUID.Zero) | 2257 | if (AVID != LLUUID.Zero) |
2258 | return AVID.ToString(); | 2258 | return AVID.ToString(); |
2259 | else | 2259 | else |
2260 | return ""; | 2260 | return String.Empty; |
2261 | } | 2261 | } |
2262 | 2262 | ||
2263 | public void llAddToLandPassList(string avatar, double hours) | 2263 | public void llAddToLandPassList(string avatar, double hours) |
@@ -2289,9 +2289,9 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2289 | { | 2289 | { |
2290 | if (src.Length == 0) | 2290 | if (src.Length == 0) |
2291 | { | 2291 | { |
2292 | return ""; | 2292 | return String.Empty; |
2293 | } | 2293 | } |
2294 | string ret = ""; | 2294 | string ret = String.Empty; |
2295 | foreach (object o in src.Data) | 2295 | foreach (object o in src.Data) |
2296 | { | 2296 | { |
2297 | ret = ret + o.ToString() + seperator; | 2297 | ret = ret + o.ToString() + seperator; |
@@ -2352,7 +2352,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2352 | if (xmlrpcMod.IsEnabled()) | 2352 | if (xmlrpcMod.IsEnabled()) |
2353 | { | 2353 | { |
2354 | LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID); | 2354 | LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID); |
2355 | object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), "", 0, "" }; | 2355 | object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), String.Empty, 0, String.Empty }; |
2356 | m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj); | 2356 | m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj); |
2357 | } | 2357 | } |
2358 | } | 2358 | } |
@@ -2360,7 +2360,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2360 | public string llSendRemoteData(string channel, string dest, int idata, string sdata) | 2360 | public string llSendRemoteData(string channel, string dest, int idata, string sdata) |
2361 | { | 2361 | { |
2362 | NotImplemented("llSendRemoteData"); | 2362 | NotImplemented("llSendRemoteData"); |
2363 | return ""; | 2363 | return String.Empty; |
2364 | } | 2364 | } |
2365 | 2365 | ||
2366 | public void llRemoteDataReply(string channel, string message_id, string sdata, int idata) | 2366 | public void llRemoteDataReply(string channel, string message_id, string sdata, int idata) |
@@ -2578,7 +2578,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2578 | public string llGetNumberOfNotecardLines(string name) | 2578 | public string llGetNumberOfNotecardLines(string name) |
2579 | { | 2579 | { |
2580 | NotImplemented("llGetNumberOfNotecardLines"); | 2580 | NotImplemented("llGetNumberOfNotecardLines"); |
2581 | return ""; | 2581 | return String.Empty; |
2582 | } | 2582 | } |
2583 | 2583 | ||
2584 | public LSL_Types.list llGetBoundingBox(string obj) | 2584 | public LSL_Types.list llGetBoundingBox(string obj) |
@@ -2600,7 +2600,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2600 | public string llIntegerToBase64(int number) | 2600 | public string llIntegerToBase64(int number) |
2601 | { | 2601 | { |
2602 | NotImplemented("llIntegerToBase64"); | 2602 | NotImplemented("llIntegerToBase64"); |
2603 | return ""; | 2603 | return String.Empty; |
2604 | } | 2604 | } |
2605 | 2605 | ||
2606 | public int llBase64ToInteger(string str) | 2606 | public int llBase64ToInteger(string str) |
@@ -2660,7 +2660,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2660 | public string llGetInventoryCreator(string item) | 2660 | public string llGetInventoryCreator(string item) |
2661 | { | 2661 | { |
2662 | NotImplemented("llGetInventoryCreator"); | 2662 | NotImplemented("llGetInventoryCreator"); |
2663 | return ""; | 2663 | return String.Empty; |
2664 | } | 2664 | } |
2665 | 2665 | ||
2666 | public void llOwnerSay(string msg) | 2666 | public void llOwnerSay(string msg) |
@@ -2828,7 +2828,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2828 | 2828 | ||
2829 | public string llXorBase64StringsCorrect(string str1, string str2) | 2829 | public string llXorBase64StringsCorrect(string str1, string str2) |
2830 | { | 2830 | { |
2831 | string ret = ""; | 2831 | string ret = String.Empty; |
2832 | string src1 = llBase64ToString(str1); | 2832 | string src1 = llBase64ToString(str1); |
2833 | string src2 = llBase64ToString(str2); | 2833 | string src2 = llBase64ToString(str2); |
2834 | int c = 0; | 2834 | int c = 0; |
@@ -3002,7 +3002,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
3002 | public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, | 3002 | public string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, |
3003 | int timer) | 3003 | int timer) |
3004 | { | 3004 | { |
3005 | if (dynamicID == "") | 3005 | if (dynamicID == String.Empty) |
3006 | { | 3006 | { |
3007 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); | 3007 | IDynamicTextureManager textureManager = World.RequestModuleInterface<IDynamicTextureManager>(); |
3008 | LLUUID createdTexture = | 3008 | LLUUID createdTexture = |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs index 0ae7a0a..e48f667 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs | |||
@@ -429,10 +429,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
429 | public override string ToString() | 429 | public override string ToString() |
430 | { | 430 | { |
431 | string output; | 431 | string output; |
432 | output = ""; | 432 | output = String.Empty; |
433 | if (m_data.Length == 0) | 433 | if (m_data.Length == 0) |
434 | { | 434 | { |
435 | return ""; | 435 | return String.Empty; |
436 | } | 436 | } |
437 | foreach (object o in m_data) | 437 | foreach (object o in m_data) |
438 | { | 438 | { |
diff --git a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs index 48cf45a..1572a51 100644 --- a/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/ScriptEngine/Common/Properties/AssemblyInfo.cs | |||
@@ -1,3 +1,31 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | |||
1 | using System.Reflection; | 29 | using System.Reflection; |
2 | using System.Runtime.InteropServices; | 30 | using System.Runtime.InteropServices; |
3 | 31 | ||
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices; | |||
10 | [assembly : AssemblyConfiguration("")] | 38 | [assembly : AssemblyConfiguration("")] |
11 | [assembly : AssemblyCompany("")] | 39 | [assembly : AssemblyCompany("")] |
12 | [assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.Common")] | 40 | [assembly : AssemblyProduct("OpenSim.Region.ScriptEngine.Common")] |
13 | [assembly : AssemblyCopyright("Copyright © 2007")] | 41 | [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] |
14 | [assembly : AssemblyTrademark("")] | 42 | [assembly : AssemblyTrademark("")] |
15 | [assembly : AssemblyCulture("")] | 43 | [assembly : AssemblyCulture("")] |
16 | 44 | ||
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 6df8343..0a8f7ea 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs | |||
@@ -148,7 +148,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
148 | // Handled by long commands | 148 | // Handled by long commands |
149 | public void timer(uint localID, LLUUID itemID) | 149 | public void timer(uint localID, LLUUID itemID) |
150 | { | 150 | { |
151 | //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, ""); | 151 | //myScriptEngine.m_EventQueueManager.AddToScriptQueue(localID, itemID, String.Empty); |
152 | } | 152 | } |
153 | 153 | ||
154 | public void listen(uint localID, LLUUID itemID) | 154 | public void listen(uint localID, LLUUID itemID) |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs index 8081e2c..af91027 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventQueueManager.cs | |||
@@ -323,7 +323,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
323 | // Do we have any scripts in this object at all? If not, return | 323 | // Do we have any scripts in this object at all? If not, return |
324 | if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false) | 324 | if (m_ScriptEngine.m_ScriptManager.Scripts.ContainsKey(localID) == false) |
325 | { | 325 | { |
326 | //Console.WriteLine("Event \"" + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); | 326 | //Console.WriteLine("Event \String.Empty + FunctionName + "\" for localID: " + localID + ". No scripts found on this localID."); |
327 | return; | 327 | return; |
328 | } | 328 | } |
329 | 329 | ||
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs index 635c32a..7271d72 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/LSLLongCmdHandler.cs | |||
@@ -259,7 +259,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
259 | //Deliver data to prim's remote_data handler | 259 | //Deliver data to prim's remote_data handler |
260 | object[] resobj = new object[] | 260 | object[] resobj = new object[] |
261 | { | 261 | { |
262 | 2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), "", | 262 | 2, rInfo.GetChannelKey().ToString(), rInfo.GetMessageID().ToString(), String.Empty, |
263 | rInfo.GetIntValue(), | 263 | rInfo.GetIntValue(), |
264 | rInfo.GetStrVal() | 264 | rInfo.GetStrVal() |
265 | }; | 265 | }; |
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs index 8f74620..784e849 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/ScriptManager.cs | |||
@@ -161,7 +161,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase | |||
161 | catch (ThreadAbortException tae) | 161 | catch (ThreadAbortException tae) |
162 | { | 162 | { |
163 | string a = tae.ToString(); | 163 | string a = tae.ToString(); |
164 | a = ""; | 164 | a = String.Empty; |
165 | // Expected | 165 | // Expected |
166 | } | 166 | } |
167 | } | 167 | } |