diff options
| author | dr scofield (aka dirk husemann) | 2009-09-09 08:28:13 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-09-09 09:56:07 +0200 |
| commit | 62358014ed59136cfd1d452f08171a0bc32612cf (patch) | |
| tree | 18da2e54e352c7e168471de4559868b724f977d1 /OpenSim/Region | |
| parent | additional log files to ignore, also ignoring TestResult.xml (diff) | |
| download | opensim-SC_OLD-62358014ed59136cfd1d452f08171a0bc32612cf.zip opensim-SC_OLD-62358014ed59136cfd1d452f08171a0bc32612cf.tar.gz opensim-SC_OLD-62358014ed59136cfd1d452f08171a0bc32612cf.tar.bz2 opensim-SC_OLD-62358014ed59136cfd1d452f08171a0bc32612cf.tar.xz | |
reformatting.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 017a6f6..02befda 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -9524,29 +9524,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 9524 | 9524 | ||
| 9525 | if (NotecardCache.IsCached(assetID)) | 9525 | if (NotecardCache.IsCached(assetID)) |
| 9526 | { | 9526 | { |
| 9527 | AsyncCommands. | 9527 | AsyncCommands.DataserverPlugin.DataserverReply(assetID.ToString(), |
| 9528 | DataserverPlugin.DataserverReply(assetID.ToString(), | 9528 | NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); |
| 9529 | NotecardCache.GetLine(assetID, line, m_notecardLineReadCharsMax)); | ||
| 9530 | ConditionalScriptSleep(100); | 9529 | ConditionalScriptSleep(100); |
| 9531 | return tid.ToString(); | 9530 | return tid.ToString(); |
| 9532 | } | 9531 | } |
| 9533 | 9532 | ||
| 9534 | WithNotecard(assetID, delegate (UUID id, AssetBase a) | 9533 | WithNotecard(assetID, delegate (UUID id, AssetBase a) |
| 9535 | { | 9534 | { |
| 9536 | if (a == null || a.Type != 7) | 9535 | if (a == null || a.Type != 7) |
| 9537 | { | 9536 | { |
| 9538 | ShoutError("Notecard '" + name + "' could not be found."); | 9537 | ShoutError("Notecard '" + name + "' could not be found."); |
| 9539 | return; | 9538 | return; |
| 9540 | } | 9539 | } |
| 9541 | 9540 | ||
| 9542 | System.Text.UTF8Encoding enc = | 9541 | System.Text.UTF8Encoding enc = |
| 9543 | new System.Text.UTF8Encoding(); | 9542 | new System.Text.UTF8Encoding(); |
| 9544 | string data = enc.GetString(a.Data); | 9543 | string data = enc.GetString(a.Data); |
| 9545 | //m_log.Debug(data); | 9544 | //m_log.Debug(data); |
| 9546 | NotecardCache.Cache(id, data); | 9545 | NotecardCache.Cache(id, data); |
| 9547 | AsyncCommands.DataserverPlugin.DataserverReply(id.ToString(), | 9546 | AsyncCommands.DataserverPlugin.DataserverReply(id.ToString(), |
| 9548 | NotecardCache.GetLine(id, line, m_notecardLineReadCharsMax)); | 9547 | NotecardCache.GetLine(id, line, m_notecardLineReadCharsMax)); |
| 9549 | }); | 9548 | }); |
| 9550 | 9549 | ||
| 9551 | ConditionalScriptSleep(100); | 9550 | ConditionalScriptSleep(100); |
| 9552 | return tid.ToString(); | 9551 | return tid.ToString(); |