ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-20 15:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

missing file and remove dead code

Browse Source
This commit is contained in:
UbitUmarov
2020-02-08 16:27:30 +00:00
parent 68e7e65e2e
commit 8cbe743440
3 changed files with 20 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
View File

@@ -595,15 +595,20 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
try
{
string jsondata = SLUtil.ParseNotecardToString(a.Data);
int result = m_store.SetValue(storeID, path, jsondata,true) ? 1 : 0;
int result;
string[] data = SLUtil.ParseNotecardToArray(a.Data);
if(data.Length == 0)
result = m_store.SetValue(storeID, path, string.Empty, true) ? 1 : 0;
else
{
StringBuilder sb = new StringBuilder(256);
for(int i = 0; i < data.Length; ++i)
sb.AppendLine(data[i]);
result = m_store.SetValue(storeID, path, sb.ToString(),true) ? 1 : 0;
}
m_comms.DispatchReply(scriptID, result, "", reqID.ToString());
return;
}
catch(SLUtil.NotANotecardFormatException e)
{
m_log.WarnFormat("[JsonStoreScripts]: Notecard parsing failed; assetId {0} at line number {1}", assetID.ToString(), e.lineNumber);
}
catch (Exception e)
{
m_log.WarnFormat("[JsonStoreScripts]: Json parsing failed; {0}", e.Message);