Merge branch 'master' into careminster
commit
121c6b4835
|
@ -36,10 +36,10 @@ namespace OpenSim.Framework
|
|||
|
||||
public enum EstateAccessCodex : uint
|
||||
{
|
||||
AccessOptions = 17,
|
||||
AllowedGroups = 18,
|
||||
EstateBans = 20,
|
||||
EstateManagers = 24
|
||||
AccessOptions = 1,
|
||||
AllowedGroups = 2,
|
||||
EstateBans = 4,
|
||||
EstateManagers = 8
|
||||
}
|
||||
|
||||
[Flags]public enum TeleportFlags : uint
|
||||
|
|
|
@ -3918,7 +3918,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
|
||||
returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
|
||||
returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
|
||||
returnblock[j].Parameter = Utils.StringToBytes(Data.Length.ToString()); j++;
|
||||
returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
|
||||
|
||||
j = 2; // Agents
|
||||
if ((code & 2) != 0)
|
||||
j = 3; // Groups
|
||||
if ((code & 8) != 0)
|
||||
j = 5; // Managers
|
||||
|
||||
returnblock[j].Parameter = Utils.StringToBytes(Data.Length.ToString());
|
||||
j = 6;
|
||||
|
||||
for (int i = 0; i < Data.Length; i++)
|
||||
{
|
||||
returnblock[j].Parameter = Data[i].GetBytes(); j++;
|
||||
|
|
Loading…
Reference in New Issue