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

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-12-12 01:22:50 +00:00
parent fe61c00958 8ea4933742
commit 28022a9198
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -1317,7 +1317,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public void osParcelSetDetails(LSL_Vector pos, LSL_List rules) public void osParcelSetDetails(LSL_Vector pos, LSL_List rules)
{ {
CheckThreatLevel(ThreatLevel.High, "osParcelSetDetails"); const string functionName = "osParcelSetDetails";
CheckThreatLevel(ThreatLevel.High, functionName);
OSSLDeprecated(functionName, "osSetParcelDetails");
SetParcelDetails(pos, rules, functionName);
}
public void osSetParcelDetails(LSL_Vector pos, LSL_List rules)
{
const string functionName = "osSetParcelDetails";
CheckThreatLevel(ThreatLevel.High, functionName);
SetParcelDetails(pos, rules, functionName);
}
private void SetParcelDetails(LSL_Vector pos, LSL_List rules, string functionName)
{
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
// Get a reference to the land data and make sure the owner of the script // Get a reference to the land data and make sure the owner of the script
@ -1356,13 +1368,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
break; break;
case 2: case 2:
CheckThreatLevel(ThreatLevel.VeryHigh, "osParcelSetDetails"); CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
if (UUID.TryParse(arg , out uuid)) if (UUID.TryParse(arg , out uuid))
newLand.OwnerID = uuid; newLand.OwnerID = uuid;
break; break;
case 3: case 3:
CheckThreatLevel(ThreatLevel.VeryHigh, "osParcelSetDetails"); CheckThreatLevel(ThreatLevel.VeryHigh, functionName);
if (UUID.TryParse(arg , out uuid)) if (UUID.TryParse(arg , out uuid))
newLand.GroupID = uuid; newLand.GroupID = uuid;
break; break;

3
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -135,7 +135,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
// Parcel commands // Parcel commands
void osParcelJoin(vector pos1, vector pos2); void osParcelJoin(vector pos1, vector pos2);
void osParcelSubdivide(vector pos1, vector pos2); void osParcelSubdivide(vector pos1, vector pos2);
void osParcelSetDetails(vector pos, LSL_List rules); void osSetParcelDetails(vector pos, LSL_List rules);
void osParcelSetDetails(vector pos, LSL_List rules); // Deprecated
string osGetScriptEngineName(); string osGetScriptEngineName();
string osGetSimulatorVersion(); string osGetSimulatorVersion();

5
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -127,6 +127,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
m_OSSL_Functions.osParcelSubdivide(pos1, pos2); m_OSSL_Functions.osParcelSubdivide(pos1, pos2);
} }
public void osSetParcelDetails(vector pos, LSL_List rules)
{
m_OSSL_Functions.osSetParcelDetails(pos, rules);
}
// Deprecated
public void osParcelSetDetails(vector pos, LSL_List rules) public void osParcelSetDetails(vector pos, LSL_List rules)
{ {
m_OSSL_Functions.osParcelSetDetails(pos,rules); m_OSSL_Functions.osParcelSetDetails(pos,rules);

4
bin/OpenSimDefaults.ini
View File

@ -397,9 +397,7 @@
; sized packets and faster sending of data, but more delay in ; sized packets and faster sending of data, but more delay in
; updating interest lists ; updating interest lists
; ;
;PrimTerseUpdatesPerPacket = 25 ;PrimUpdatesPerCallback = 100
;AvatarTerseUpdatesPerPacket = 10
;PrimFullUpdatesPerPacket = 100
; TextureSendLimit determines how many packets will be put on ; TextureSendLimit determines how many packets will be put on
; the outgoing queue each cycle. Like the settings above, this ; the outgoing queue each cycle. Like the settings above, this