soem cleanup
UbitUmarov
parent
ea32a73103
commit
3a055c578d
|
|
@ -1769,19 +1769,12 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
float localHalfAVHeight = 0.8f;
|
||||
if (Appearance != null)
|
||||
localHalfAVHeight = Appearance.AvatarHeight / 2;
|
||||
|
||||
float posZLimit = 22;
|
||||
|
||||
// TODO: Check other Scene HeightField
|
||||
posZLimit = (float)Scene.Heightmap[(int)newpos.X, (int)newpos.Y];
|
||||
localHalfAVHeight = Appearance.AvatarHeight * 0.5f;
|
||||
|
||||
float posZLimit = (float)Scene.Heightmap[(int)newpos.X, (int)newpos.Y];
|
||||
posZLimit += localHalfAVHeight + 0.1f;
|
||||
|
||||
if ((newpos.Z < posZLimit) && !(Single.IsInfinity(posZLimit) || Single.IsNaN(posZLimit)))
|
||||
{
|
||||
if (newpos.Z < posZLimit)
|
||||
newpos.Z = posZLimit;
|
||||
}
|
||||
|
||||
if ((flags & 8) != 0)
|
||||
Flying = true;
|
||||
|
|
|
|||
|
|
@ -936,7 +936,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
|
||||
Vector3 pos = presence.AbsolutePosition;
|
||||
if (!checkAllowAgentTPbyLandOwner(agentId, pos))
|
||||
return;
|
||||
return;
|
||||
|
||||
World.RequestLocalTeleport(presence, position, velocity, lookat, flags);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
|||
public partial class ScriptBaseClass
|
||||
{
|
||||
// SCRIPTS CONSTANTS
|
||||
public static readonly LSLInteger OS_APIVERSION = 3;
|
||||
public static readonly LSLInteger OS_APIVERSION = 4;
|
||||
|
||||
public static readonly LSLInteger TRUE = 1;
|
||||
public static readonly LSLInteger FALSE = 0;
|
||||
|
|
@ -898,6 +898,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
|||
//ApiDesc osTeleportObject flag: the rotation is the final rotation, otherwise is a added rotation
|
||||
public const int OSTPOBJ_SETROT = 0x4;
|
||||
|
||||
//ApiDesc osLocalTeleportAgent no flags
|
||||
public const int OS_LTPAG_NONE = 0x0;
|
||||
//ApiDesc osLocalTeleportAgent use velocity
|
||||
public const int OS_LTPAG_USEVEL = 0x1;
|
||||
//ApiDesc osLocalTeleportAgent use lookat
|
||||
public const int OS_LTPAG_USELOOKAT = 0x2;
|
||||
//ApiDesc osLocalTeleportAgent align lookat to velocity
|
||||
public const int OS_LTPAG_ALGNLV = 0x4;
|
||||
//ApiDesc osLocalTeleportAgent force fly
|
||||
public const int OS_LTPAG_FORCEFLY = 0x8;
|
||||
//ApiDesc osLocalTeleportAgent force no fly
|
||||
public const int OS_LTPAG_FORCENOFLY = 0x16;
|
||||
|
||||
// Constants for Windlight
|
||||
public const int WL_WATER_COLOR = 0;
|
||||
public const int WL_WATER_FOG_DENSITY_EXPONENT = 1;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
5b85f255-466f-238d-90ed-5726eaa2e67b
|
||||
24121ec8-c0a3-099d-8d83-64feaa32418c
|
||||
<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
|
||||
<key>controls</key>
|
||||
<map>
|
||||
|
|
@ -1513,7 +1513,7 @@
|
|||
</map>
|
||||
<key>OS_APIVERSION</key><map>
|
||||
<key>type</key><string>integer</string>
|
||||
<key>value</key><string>3</string>
|
||||
<key>value</key><string>4</string>
|
||||
</map>
|
||||
<key>OS_ATTACH_MSG_ALL</key><map>
|
||||
<key>type</key><string>integer</string>
|
||||
|
|
@ -1539,6 +1539,36 @@
|
|||
<key>type</key><string>integer</string>
|
||||
<key>value</key><string>0x1</string>
|
||||
</map>
|
||||
<key>OS_LTPAG_ALGNLV</key><map>
|
||||
<key>type</key><string>integer</string>
|
||||
<key>value</key><string>0x4</string>
|
||||
<key>tooltip</key><string>osLocalTeleportAgent align lookat to velocity</string>
|
||||
</map>
|
||||
<key>OS_LTPAG_FORCEFLY</key><map>
|
||||
<key>type</key><string>integer</string>
|
||||
<key>value</key><string>0x8</string>
|
||||
<key>tooltip</key><string>osLocalTeleportAgent force fly</string>
|
||||
</map>
|
||||
<key>OS_LTPAG_FORCENOFLY</key><map>
|
||||
<key>type</key><string>integer</string>
|
||||
<key>value</key><string>0x16</string>
|
||||
<key>tooltip</key><string>osLocalTeleportAgent force no fly</string>
|
||||
</map>
|
||||
<key>OS_LTPAG_NONE</key><map>
|
||||
<key>type</key><string>integer</string>
|
||||
<key>value</key><string>0x0</string>
|
||||
<key>tooltip</key><string>osLocalTeleportAgent no flags</string>
|
||||
</map>
|
||||
<key>OS_LTPAG_USELOOKAT</key><map>
|
||||
<key>type</key><string>integer</string>
|
||||
<key>value</key><string>0x2</string>
|
||||
<key>tooltip</key><string>osLocalTeleportAgent use lookat</string>
|
||||
</map>
|
||||
<key>OS_LTPAG_USEVEL</key><map>
|
||||
<key>type</key><string>integer</string>
|
||||
<key>value</key><string>0x1</string>
|
||||
<key>tooltip</key><string>osLocalTeleportAgent use velocity</string>
|
||||
</map>
|
||||
<key>OS_NPC_CREATOR_OWNED</key><map>
|
||||
<key>type</key><string>integer</string>
|
||||
<key>value</key><string>0x1</string>
|
||||
|
|
@ -6116,33 +6146,6 @@
|
|||
<key>arguments</key><array>
|
||||
<map><key>a</key><map><key>type</key><string>float</string></map></map>
|
||||
<map><key>b</key><map><key>type</key><string>float</string></map></map>
|
||||
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osApproxEquals</key>
|
||||
<map>
|
||||
<key>return</key><string>integer</string>
|
||||
<key>arguments</key><array>
|
||||
<map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
|
||||
<map><key>rb</key><map><key>type</key><string>rotation</string></map></map>
|
||||
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osApproxEquals</key>
|
||||
<map>
|
||||
<key>return</key><string>integer</string>
|
||||
<key>arguments</key><array>
|
||||
<map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
|
||||
<map><key>rb</key><map><key>type</key><string>rotation</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osApproxEquals</key>
|
||||
<map>
|
||||
<key>return</key><string>integer</string>
|
||||
<key>arguments</key><array>
|
||||
<map><key>va</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>vb</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osApproxEquals</key>
|
||||
|
|
@ -6159,6 +6162,33 @@
|
|||
<key>arguments</key><array>
|
||||
<map><key>a</key><map><key>type</key><string>float</string></map></map>
|
||||
<map><key>b</key><map><key>type</key><string>float</string></map></map>
|
||||
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osApproxEquals</key>
|
||||
<map>
|
||||
<key>return</key><string>integer</string>
|
||||
<key>arguments</key><array>
|
||||
<map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
|
||||
<map><key>rb</key><map><key>type</key><string>rotation</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osApproxEquals</key>
|
||||
<map>
|
||||
<key>return</key><string>integer</string>
|
||||
<key>arguments</key><array>
|
||||
<map><key>ra</key><map><key>type</key><string>rotation</string></map></map>
|
||||
<map><key>rb</key><map><key>type</key><string>rotation</string></map></map>
|
||||
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osApproxEquals</key>
|
||||
<map>
|
||||
<key>return</key><string>integer</string>
|
||||
<key>arguments</key><array>
|
||||
<map><key>va</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>vb</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>margin</key><map><key>type</key><string>float</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osAvatarName2Key</key>
|
||||
|
|
@ -6284,8 +6314,6 @@
|
|||
<key>return</key><string>string</string>
|
||||
<key>arguments</key><array>
|
||||
<map><key>drawList</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>startX</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>startY</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>endX</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>endY</key><map><key>type</key><string>integer</string></map></map>
|
||||
</array>
|
||||
|
|
@ -6295,6 +6323,8 @@
|
|||
<key>return</key><string>string</string>
|
||||
<key>arguments</key><array>
|
||||
<map><key>drawList</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>startX</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>startY</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>endX</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>endY</key><map><key>type</key><string>integer</string></map></map>
|
||||
</array>
|
||||
|
|
@ -6433,13 +6463,13 @@
|
|||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>avatar</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>target</key><map><key>type</key><string>string</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osForceOtherSit</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>avatar</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>target</key><map><key>type</key><string>string</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osFormatString</key>
|
||||
|
|
@ -6754,15 +6784,15 @@
|
|||
<key>osKickAvatar</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>agentId</key><map><key>type</key><string>key</string></map></map>
|
||||
<map><key>FirstName</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>SurName</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>alert</key><map><key>type</key><string>string</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osKickAvatar</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>FirstName</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>SurName</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>agentId</key><map><key>type</key><string>key</string></map></map>
|
||||
<map><key>alert</key><map><key>type</key><string>string</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
|
|
@ -6781,6 +6811,16 @@
|
|||
<key>return</key><string>string</string>
|
||||
<key>arguments</key><undef/>
|
||||
</map>
|
||||
<key>osLocalTeleportAgent</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>agent</key><map><key>type</key><string>key</string></map></map>
|
||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>velocity</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>flags</key><map><key>type</key><string>integer</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osLoopSound</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
|
|
@ -7105,13 +7145,13 @@
|
|||
<key>osRegionNotice</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>agentID</key><map><key>type</key><string>key</string></map></map>
|
||||
<map><key>msg</key><map><key>type</key><string>string</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osRegionNotice</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>agentID</key><map><key>type</key><string>key</string></map></map>
|
||||
<map><key>msg</key><map><key>type</key><string>string</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
|
|
@ -7349,17 +7389,6 @@
|
|||
</array>
|
||||
</map>
|
||||
<key>osSetProjectionParams</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>prim</key><map><key>type</key><string>key</string></map></map>
|
||||
<map><key>projection</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>texture</key><map><key>type</key><string>key</string></map></map>
|
||||
<map><key>fov</key><map><key>type</key><string>float</string></map></map>
|
||||
<map><key>focus</key><map><key>type</key><string>float</string></map></map>
|
||||
<map><key>amb</key><map><key>type</key><string>float</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osSetProjectionParams</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>projection</key><map><key>type</key><string>integer</string></map></map>
|
||||
|
|
@ -7380,6 +7409,17 @@
|
|||
<map><key>amb</key><map><key>type</key><string>float</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osSetProjectionParams</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>prim</key><map><key>type</key><string>key</string></map></map>
|
||||
<map><key>projection</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>texture</key><map><key>type</key><string>key</string></map></map>
|
||||
<map><key>fov</key><map><key>type</key><string>float</string></map></map>
|
||||
<map><key>focus</key><map><key>type</key><string>float</string></map></map>
|
||||
<map><key>amb</key><map><key>type</key><string>float</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osSetRegionSunSettings</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
|
|
@ -7494,8 +7534,6 @@
|
|||
<key>arguments</key><array>
|
||||
<map><key>src</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>value</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>start</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>count</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
|
|
@ -7505,6 +7543,8 @@
|
|||
<key>arguments</key><array>
|
||||
<map><key>src</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>value</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>start</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>count</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>ignorecase</key><map><key>type</key><string>integer</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
|
|
@ -7541,6 +7581,7 @@
|
|||
<key>arguments</key><array>
|
||||
<map><key>src</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>start</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>length</key><map><key>type</key><string>integer</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osStringSubString</key>
|
||||
|
|
@ -7549,7 +7590,6 @@
|
|||
<key>arguments</key><array>
|
||||
<map><key>src</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>start</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>length</key><map><key>type</key><string>integer</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osSunGetParam</key>
|
||||
|
|
@ -7579,8 +7619,6 @@
|
|||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>agent</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
||||
</array>
|
||||
|
|
@ -7589,6 +7627,8 @@
|
|||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>agent</key><map><key>type</key><string>string</string></map></map>
|
||||
<map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>regionY</key><map><key>type</key><string>integer</string></map></map>
|
||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
||||
</array>
|
||||
|
|
@ -7604,6 +7644,13 @@
|
|||
</array>
|
||||
</map>
|
||||
<key>osTeleportOwner</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osTeleportOwner</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>regionX</key><map><key>type</key><string>integer</string></map></map>
|
||||
|
|
@ -7620,13 +7667,6 @@
|
|||
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osTeleportOwner</key>
|
||||
<map>
|
||||
<key>arguments</key><array>
|
||||
<map><key>position</key><map><key>type</key><string>vector</string></map></map>
|
||||
<map><key>lookat</key><map><key>type</key><string>vector</string></map></map>
|
||||
</array>
|
||||
</map>
|
||||
<key>osTerrainFlush</key>
|
||||
<map>
|
||||
<key>arguments</key><undef/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue