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

mantis 8416: test

0.9.1.0-post-fixes
UbitUmarov 2018-12-08 02:26:36 +00:00
parent 7b2b29d10d
commit f8c3fc5e05
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/Caps/GetAssetsModule.cs
View File

@ -441,7 +441,7 @@ namespace OpenSim.Region.ClientStack.Linden
else if (m_GetMesh2URL != string.Empty) else if (m_GetMesh2URL != string.Empty)
caps.RegisterHandler("GetMesh2", m_GetMesh2URL); caps.RegisterHandler("GetMesh2", m_GetMesh2URL);
/* we can't support this cap. Current viewers connect to the workng regions. /* we can't support this cap. Current viewers connect to the wrong regions.
//ViewerAsset //ViewerAsset
if (m_GetAssetURL == "localhost") if (m_GetAssetURL == "localhost")
{ {

10
OpenSim/Region/ScriptEngine/YEngine/MMRScriptBinOpStr.cs
View File

@ -83,7 +83,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
private static TokenTypeVec tokenTypeVec = new TokenTypeVec(null); private static TokenTypeVec tokenTypeVec = new TokenTypeVec(null);
private static MethodInfo stringAddStringMethInfo = ScriptCodeGen.GetStaticMethod(typeof(string), "Concat", new Type[] { typeof(string), typeof(string) }); private static MethodInfo stringAddStringMethInfo = ScriptCodeGen.GetStaticMethod(typeof(string), "Concat", new Type[] { typeof(string), typeof(string) });
private static MethodInfo stringCmpStringMethInfo = ScriptCodeGen.GetStaticMethod(typeof(string), "Compare", new Type[] { typeof(string), typeof(string) }); private static MethodInfo stringCmpStringMethInfo = ScriptCodeGen.GetStaticMethod(typeof(string), "Compare", new Type[] { typeof(string), typeof(string), typeof(StringComparison) });
private static MethodInfo infoMethListAddFloat = GetBinOpsMethod("MethListAddFloat", new Type[] { typeof(LSL_List), typeof(double) }); private static MethodInfo infoMethListAddFloat = GetBinOpsMethod("MethListAddFloat", new Type[] { typeof(LSL_List), typeof(double) });
private static MethodInfo infoMethListAddInt = GetBinOpsMethod("MethListAddInt", new Type[] { typeof(LSL_List), typeof(int) }); private static MethodInfo infoMethListAddInt = GetBinOpsMethod("MethListAddInt", new Type[] { typeof(LSL_List), typeof(int) });
@ -959,6 +959,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
result.PopPre(scg, errorAt); result.PopPre(scg, errorAt);
left.PushVal(scg, errorAt, tokenTypeStr); left.PushVal(scg, errorAt, tokenTypeStr);
right.PushVal(scg, errorAt, tokenTypeStr); right.PushVal(scg, errorAt, tokenTypeStr);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4, (int)StringComparison.Ordinal);
scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo); scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0); scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0);
scg.ilGen.Emit(errorAt, OpCodes.Ceq); scg.ilGen.Emit(errorAt, OpCodes.Ceq);
@ -970,6 +971,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
result.PopPre(scg, errorAt); result.PopPre(scg, errorAt);
left.PushVal(scg, errorAt, tokenTypeStr); left.PushVal(scg, errorAt, tokenTypeStr);
right.PushVal(scg, errorAt, tokenTypeStr); right.PushVal(scg, errorAt, tokenTypeStr);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4, (int)StringComparison.Ordinal);
scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo); scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0); scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0);
scg.ilGen.Emit(errorAt, OpCodes.Ceq); scg.ilGen.Emit(errorAt, OpCodes.Ceq);
@ -1172,6 +1174,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
result.PopPre(scg, errorAt); result.PopPre(scg, errorAt);
left.PushVal(scg, errorAt, tokenTypeStr); left.PushVal(scg, errorAt, tokenTypeStr);
right.PushVal(scg, errorAt, tokenTypeStr); right.PushVal(scg, errorAt, tokenTypeStr);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4, (int)StringComparison.Ordinal);
scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo); scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0); scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0);
scg.ilGen.Emit(errorAt, OpCodes.Ceq); scg.ilGen.Emit(errorAt, OpCodes.Ceq);
@ -1183,6 +1186,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
result.PopPre(scg, errorAt); result.PopPre(scg, errorAt);
left.PushVal(scg, errorAt, tokenTypeStr); left.PushVal(scg, errorAt, tokenTypeStr);
right.PushVal(scg, errorAt, tokenTypeStr); right.PushVal(scg, errorAt, tokenTypeStr);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4, (int)StringComparison.Ordinal);
scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo); scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0); scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0);
scg.ilGen.Emit(errorAt, OpCodes.Ceq); scg.ilGen.Emit(errorAt, OpCodes.Ceq);
@ -1196,6 +1200,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
result.PopPre(scg, errorAt); result.PopPre(scg, errorAt);
left.PushVal(scg, errorAt, tokenTypeStr); left.PushVal(scg, errorAt, tokenTypeStr);
right.PushVal(scg, errorAt, tokenTypeStr); right.PushVal(scg, errorAt, tokenTypeStr);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4, (int)StringComparison.Ordinal);
scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo); scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0); scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0);
scg.ilGen.Emit(errorAt, OpCodes.Clt); scg.ilGen.Emit(errorAt, OpCodes.Clt);
@ -1207,6 +1212,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
result.PopPre(scg, errorAt); result.PopPre(scg, errorAt);
left.PushVal(scg, errorAt, tokenTypeStr); left.PushVal(scg, errorAt, tokenTypeStr);
right.PushVal(scg, errorAt, tokenTypeStr); right.PushVal(scg, errorAt, tokenTypeStr);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4, (int)StringComparison.Ordinal);
scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo); scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_1); scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_1);
scg.ilGen.Emit(errorAt, OpCodes.Clt); scg.ilGen.Emit(errorAt, OpCodes.Clt);
@ -1218,6 +1224,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
result.PopPre(scg, errorAt); result.PopPre(scg, errorAt);
left.PushVal(scg, errorAt, tokenTypeStr); left.PushVal(scg, errorAt, tokenTypeStr);
right.PushVal(scg, errorAt, tokenTypeStr); right.PushVal(scg, errorAt, tokenTypeStr);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4, (int)StringComparison.Ordinal);
scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo); scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0); scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_0);
scg.ilGen.Emit(errorAt, OpCodes.Cgt); scg.ilGen.Emit(errorAt, OpCodes.Cgt);
@ -1229,6 +1236,7 @@ namespace OpenSim.Region.ScriptEngine.Yengine
result.PopPre(scg, errorAt); result.PopPre(scg, errorAt);
left.PushVal(scg, errorAt, tokenTypeStr); left.PushVal(scg, errorAt, tokenTypeStr);
right.PushVal(scg, errorAt, tokenTypeStr); right.PushVal(scg, errorAt, tokenTypeStr);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4, (int)StringComparison.Ordinal);
scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo); scg.ilGen.Emit(errorAt, OpCodes.Call, stringCmpStringMethInfo);
scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_M1); scg.ilGen.Emit(errorAt, OpCodes.Ldc_I4_M1);
scg.ilGen.Emit(errorAt, OpCodes.Cgt); scg.ilGen.Emit(errorAt, OpCodes.Cgt);

2
bin/OpenSimDefaults.ini
View File

@ -361,7 +361,7 @@
; http://simulatorHTTPport/ManagedStats/?cat=Category&cont=Container&stat=Statistic ; http://simulatorHTTPport/ManagedStats/?cat=Category&cont=Container&stat=Statistic
; ManagedStatsRemoteFetchURI = "ManagedStats" ; ManagedStatsRemoteFetchURI = "ManagedStats"
; Make OpenSim start all regions woth logins disabled. They will need ; Make OpenSim start all regions with logins disabled. They will need
; to be enabled from the console if this is set ; to be enabled from the console if this is set
; StartDisabled = false ; StartDisabled = false