diff options
author | Jeff Ames | 2009-01-16 04:42:24 +0000 |
---|---|---|
committer | Jeff Ames | 2009-01-16 04:42:24 +0000 |
commit | 23bd915ecd46bbf442aad66e7011a8d2e8e4028f (patch) | |
tree | 5dfa8c15935ab4f85ebe729c85153d0ebb7ff297 /OpenSim | |
parent | Update svn properties. (diff) | |
download | opensim-SC-23bd915ecd46bbf442aad66e7011a8d2e8e4028f.zip opensim-SC-23bd915ecd46bbf442aad66e7011a8d2e8e4028f.tar.gz opensim-SC-23bd915ecd46bbf442aad66e7011a8d2e8e4028f.tar.bz2 opensim-SC-23bd915ecd46bbf442aad66e7011a8d2e8e4028f.tar.xz |
Minor formatting cleanup, add copyright header.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/WearableItem.cs | 29 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
4 files changed, 35 insertions, 8 deletions
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs index 5c5cc92..c739c86 100644 --- a/OpenSim/Data/NHibernate/NHibernateUserData.cs +++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs | |||
@@ -378,7 +378,7 @@ namespace OpenSim.Data.NHibernate | |||
378 | { | 378 | { |
379 | Dictionary<UUID, FriendRegionInfo> friendRegionInfos=new Dictionary<UUID, FriendRegionInfo>(); | 379 | Dictionary<UUID, FriendRegionInfo> friendRegionInfos=new Dictionary<UUID, FriendRegionInfo>(); |
380 | 380 | ||
381 | foreach(UUID friendId in friendsIds) | 381 | foreach (UUID friendId in friendsIds) |
382 | { | 382 | { |
383 | UserAgentData agent=GetAgentByUUID(friendId); | 383 | UserAgentData agent=GetAgentByUUID(friendId); |
384 | if (agent != null) | 384 | if (agent != null) |
diff --git a/OpenSim/Framework/WearableItem.cs b/OpenSim/Framework/WearableItem.cs index b2cb7e1..414b135 100644 --- a/OpenSim/Framework/WearableItem.cs +++ b/OpenSim/Framework/WearableItem.cs | |||
@@ -1,4 +1,31 @@ | |||
1 | using System; | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
2 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
3 | using System.Globalization; | 30 | using System.Globalization; |
4 | using System.IO; | 31 | using System.IO; |
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index d2d8335..bdb0836 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -1433,9 +1433,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1433 | foreach (UUID taskID in taskIDict.Keys) | 1433 | foreach (UUID taskID in taskIDict.Keys) |
1434 | { | 1434 | { |
1435 | UnRegisterControlEventsToScript(LocalId, taskID); | 1435 | UnRegisterControlEventsToScript(LocalId, taskID); |
1436 | taskIDict[taskID].PermsMask &= ~( | 1436 | taskIDict[taskID].PermsMask &= ~( |
1437 | 2048 | //PERMISSION_CONTROL_CAMERA | 1437 | 2048 | //PERMISSION_CONTROL_CAMERA |
1438 | 4); // PERMISSION_TAKE_CONTROLS | 1438 | 4); // PERMISSION_TAKE_CONTROLS |
1439 | } | 1439 | } |
1440 | } | 1440 | } |
1441 | 1441 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 393e708..8fd1ba3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2957,9 +2957,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2957 | { | 2957 | { |
2958 | // When agent is sitting, certain permissions are implicit if requested from sitting agent | 2958 | // When agent is sitting, certain permissions are implicit if requested from sitting agent |
2959 | int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | | 2959 | int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | |
2960 | ScriptBaseClass.PERMISSION_CONTROL_CAMERA | | 2960 | ScriptBaseClass.PERMISSION_CONTROL_CAMERA | |
2961 | ScriptBaseClass.PERMISSION_TRACK_CAMERA | | 2961 | ScriptBaseClass.PERMISSION_TRACK_CAMERA | |
2962 | ScriptBaseClass.PERMISSION_TAKE_CONTROLS; | 2962 | ScriptBaseClass.PERMISSION_TAKE_CONTROLS; |
2963 | 2963 | ||
2964 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms | 2964 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms |
2965 | { | 2965 | { |