ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'careminster' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-04-13 04:36:08 +01:00
parent ba31b31ed0 a1c4585a39
commit 9920e219dd
25 changed files with 694 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@@ -5255,7 +5255,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
args.Channel = ch;
args.From = String.Empty;
args.Message = Utils.BytesToString(msg);
args.Type = ChatTypeEnum.Shout;
args.Type = ChatTypeEnum.Region; //Behaviour in SL is that the response can be heard from any distance
args.Position = new Vector3();
args.Scene = Scene;
args.Sender = this;
@@ -11277,9 +11277,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_groupPowers.Clear();
for (int i = 0; i < GroupMembership.Length; i++)
if (GroupMembership != null)
{
m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers;
for (int i = 0; i < GroupMembership.Length; i++)
{
m_groupPowers[GroupMembership[i].GroupID] = GroupMembership[i].GroupPowers;
}
}
}
}