diff options
| author | Justin Clark-Casey (justincc) | 2010-07-28 18:55:29 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-07-28 18:55:29 +0100 |
| commit | 5aa56b12743c19a68cb371609be797e5fb3e2c4b (patch) | |
| tree | 4b9b23b0e4de1397e16eaa6cd03baa8edfedd7b3 /OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |
| parent | comment out further debug line in BaseHttpServer (diff) | |
| download | opensim-SC_OLD-5aa56b12743c19a68cb371609be797e5fb3e2c4b.zip opensim-SC_OLD-5aa56b12743c19a68cb371609be797e5fb3e2c4b.tar.gz opensim-SC_OLD-5aa56b12743c19a68cb371609be797e5fb3e2c4b.tar.bz2 opensim-SC_OLD-5aa56b12743c19a68cb371609be797e5fb3e2c4b.tar.xz | |
Fix problem where changes to media textures for prims duplicated by shify copy would change both prims until server restart
I also found out that you can crash the current viewer by giving it more media entrys than it's expecting
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 982ac52..3a642f4 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | |||
| @@ -1923,9 +1923,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1923 | if (null == me) | 1923 | if (null == me) |
| 1924 | return true; | 1924 | return true; |
| 1925 | 1925 | ||
| 1926 | m_log.DebugFormat( | 1926 | // m_log.DebugFormat( |
| 1927 | "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}", | 1927 | // "[PERMISSIONS]: Checking CanControlPrimMedia for {0} on {1} face {2} with control permissions {3}", |
| 1928 | agentID, primID, face, me.ControlPermissions); | 1928 | // agentID, primID, face, me.ControlPermissions); |
| 1929 | 1929 | ||
| 1930 | return GenericPrimMediaPermission(part, agentID, me.ControlPermissions); | 1930 | return GenericPrimMediaPermission(part, agentID, me.ControlPermissions); |
| 1931 | } | 1931 | } |
| @@ -1949,9 +1949,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions | |||
| 1949 | if (null == me) | 1949 | if (null == me) |
| 1950 | return true; | 1950 | return true; |
| 1951 | 1951 | ||
| 1952 | m_log.DebugFormat( | 1952 | // m_log.DebugFormat( |
| 1953 | "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}", | 1953 | // "[PERMISSIONS]: Checking CanInteractWithPrimMedia for {0} on {1} face {2} with interact permissions {3}", |
| 1954 | agentID, primID, face, me.InteractPermissions); | 1954 | // agentID, primID, face, me.InteractPermissions); |
| 1955 | 1955 | ||
| 1956 | return GenericPrimMediaPermission(part, agentID, me.InteractPermissions); | 1956 | return GenericPrimMediaPermission(part, agentID, me.InteractPermissions); |
| 1957 | } | 1957 | } |