diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs index 000f3c6..394b1bb 100644 --- a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs +++ b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -38,13 +38,13 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan | |||
38 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 38 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
39 | 39 | ||
40 | private List<string> bans; | 40 | private List<string> bans; |
41 | private SceneBase m_scene; | 41 | // private SceneBase m_scene; |
42 | public SceneBanner(SceneBase scene, List<string> banList) | 42 | public SceneBanner(SceneBase scene, List<string> banList) |
43 | { | 43 | { |
44 | scene.EventManager.OnClientConnect += EventManager_OnClientConnect; | 44 | scene.EventManager.OnClientConnect += EventManager_OnClientConnect; |
45 | 45 | ||
46 | bans = banList; | 46 | bans = banList; |
47 | m_scene = scene; | 47 | // m_scene = scene; |
48 | } | 48 | } |
49 | 49 | ||
50 | void EventManager_OnClientConnect(IClientCore client) | 50 | void EventManager_OnClientConnect(IClientCore client) |
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 063081e..259a333 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -305,7 +305,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
305 | Primitive.TextureEntry tmptex = part.Shape.Textures; | 305 | Primitive.TextureEntry tmptex = part.Shape.Textures; |
306 | 306 | ||
307 | // remove the old asset from the cache | 307 | // remove the old asset from the cache |
308 | UUID oldID = tmptex.DefaultTexture.TextureID; | 308 | // UUID oldID = tmptex.DefaultTexture.TextureID; |
309 | 309 | ||
310 | tmptex.DefaultTexture.TextureID = asset.FullID; | 310 | tmptex.DefaultTexture.TextureID = asset.FullID; |
311 | // I'm pretty sure we always want to force this to true | 311 | // I'm pretty sure we always want to force this to true |