Minor formatting cleanup, add copyright header.
parent
5c310efb79
commit
23bd915ecd
|
@ -378,7 +378,7 @@ namespace OpenSim.Data.NHibernate
|
||||||
{
|
{
|
||||||
Dictionary<UUID, FriendRegionInfo> friendRegionInfos=new Dictionary<UUID, FriendRegionInfo>();
|
Dictionary<UUID, FriendRegionInfo> friendRegionInfos=new Dictionary<UUID, FriendRegionInfo>();
|
||||||
|
|
||||||
foreach(UUID friendId in friendsIds)
|
foreach (UUID friendId in friendsIds)
|
||||||
{
|
{
|
||||||
UserAgentData agent=GetAgentByUUID(friendId);
|
UserAgentData agent=GetAgentByUUID(friendId);
|
||||||
if (agent != null)
|
if (agent != null)
|
||||||
|
|
|
@ -1,4 +1,31 @@
|
||||||
using System;
|
/*
|
||||||
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the OpenSimulator Project nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
|
@ -1433,9 +1433,9 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
foreach (UUID taskID in taskIDict.Keys)
|
foreach (UUID taskID in taskIDict.Keys)
|
||||||
{
|
{
|
||||||
UnRegisterControlEventsToScript(LocalId, taskID);
|
UnRegisterControlEventsToScript(LocalId, taskID);
|
||||||
taskIDict[taskID].PermsMask &= ~(
|
taskIDict[taskID].PermsMask &= ~(
|
||||||
2048 | //PERMISSION_CONTROL_CAMERA
|
2048 | //PERMISSION_CONTROL_CAMERA
|
||||||
4); // PERMISSION_TAKE_CONTROLS
|
4); // PERMISSION_TAKE_CONTROLS
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2957,9 +2957,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
{
|
{
|
||||||
// When agent is sitting, certain permissions are implicit if requested from sitting agent
|
// When agent is sitting, certain permissions are implicit if requested from sitting agent
|
||||||
int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
|
int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
|
||||||
ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
|
ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
|
||||||
ScriptBaseClass.PERMISSION_TRACK_CAMERA |
|
ScriptBaseClass.PERMISSION_TRACK_CAMERA |
|
||||||
ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
|
ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
|
||||||
|
|
||||||
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
|
if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue