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

Merge branch 'master' into ubitworkmaster

avinationmerge
UbitUmarov 2014-08-13 15:50:12 +01:00
parent 92117d48af b96f951a6a
commit 3f0138c967
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5525,10 +5525,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject);
AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject);
AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand);
// AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false);
AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, true);
AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false);
AddLocalPacketHandler(PacketType.AgentWearablesRequest, HandlerAgentWearablesRequest);
AddLocalPacketHandler(PacketType.AgentSetAppearance, HandlerAgentSetAppearance);
AddLocalPacketHandler(PacketType.AgentIsNowWearing, HandlerAgentIsNowWearing);
@ -6494,7 +6491,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Action<IClientAPI> handlerRegionHandShakeReply = OnRegionHandShakeReply;
if (handlerRegionHandShakeReply != null)
{
Thread.Sleep(100);
handlerRegionHandShakeReply(this);
}

7
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -1877,6 +1877,8 @@ namespace OpenSim.Region.Framework.Scenes
}
public void AddTextureAnimation(Primitive.TextureAnimation pTexAnim)
{
if (((int)pTexAnim.Flags & 1) != 0) // ANIM_ON
{
byte[] data = new byte[16];
int pos = 0;
@ -1895,6 +1897,11 @@ namespace OpenSim.Region.Framework.Scenes
m_TextureAnimation = data;
}
else
{
m_TextureAnimation = Utils.EmptyBytes;
}
}
public void AdjustSoundGain(double volume)
{

12
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -6001,17 +6001,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
for (int i = 0; i < length; i++)
{
int needle = llGetListEntryType(test, 0).value;
int haystack = llGetListEntryType(src, i).value;
// Why this piece of insanity? This is because most script constants are C# value types (e.g. int)
// rather than wrapped LSL types. Such a script constant does not have int.Equal(LSL_Integer) code
// and so the comparison fails even if the LSL_Integer conceptually has the same value.
// Therefore, here we test Equals on both the source and destination objects.
// However, a future better approach may be use LSL struct script constants (e.g. LSL_Integer(1)).
if (src.Data[i].Equals(test.Data[0]) || test.Data[0].Equals(src.Data[i]))
if ((needle == haystack) && (src.Data[i].Equals(test.Data[0]) || test.Data[0].Equals(src.Data[i])))
{
int j;
for (j = 1; j < test.Length; j++)
if (!(src.Data[i+j].Equals(test.Data[j]) || test.Data[j].Equals(src.Data[i+j])))
{
needle = llGetListEntryType(test, j).value;
haystack = llGetListEntryType(src, i+j).value;
if ((needle != haystack) || (!(src.Data[i+j].Equals(test.Data[j]) || test.Data[j].Equals(src.Data[i+j]))))
break;
}
if (j == test.Length)
{