diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs index 8fd8d1f..dfe097e 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
84 | public void AddRegion(Scene s) | 84 | public void AddRegion(Scene s) |
85 | { | 85 | { |
86 | m_scene = s; | 86 | m_scene = s; |
87 | 87 | ||
88 | } | 88 | } |
89 | 89 | ||
90 | public void RemoveRegion(Scene s) | 90 | public void RemoveRegion(Scene s) |
@@ -94,14 +94,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
94 | s.EventManager.OnRemovePresence -= DeRegisterPresence; | 94 | s.EventManager.OnRemovePresence -= DeRegisterPresence; |
95 | m_BakedTextureModule = null; | 95 | m_BakedTextureModule = null; |
96 | m_scene = null; | 96 | m_scene = null; |
97 | } | 97 | } |
98 | 98 | ||
99 | public void RegionLoaded(Scene s) | 99 | public void RegionLoaded(Scene s) |
100 | { | 100 | { |
101 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 101 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
102 | m_scene.EventManager.OnNewPresence += RegisterNewPresence; | 102 | m_scene.EventManager.OnNewPresence += RegisterNewPresence; |
103 | m_scene.EventManager.OnRemovePresence += DeRegisterPresence; | 103 | m_scene.EventManager.OnRemovePresence += DeRegisterPresence; |
104 | 104 | ||
105 | } | 105 | } |
106 | 106 | ||
107 | private void DeRegisterPresence(UUID agentId) | 107 | private void DeRegisterPresence(UUID agentId) |
@@ -205,7 +205,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
205 | } | 205 | } |
206 | } | 206 | } |
207 | else | 207 | else |
208 | { | 208 | { |
209 | for (int i = 0; i < maxCacheitemsLoop; i++) | 209 | for (int i = 0; i < maxCacheitemsLoop; i++) |
210 | { | 210 | { |
211 | if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex) | 211 | if (textureEntry.FaceTextures.Length > cacheItems[i].TextureIndex) |
@@ -285,7 +285,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
285 | avatarhandler.UploadBakedTexture, | 285 | avatarhandler.UploadBakedTexture, |
286 | "UploadBakedTexture", | 286 | "UploadBakedTexture", |
287 | agentID.ToString())); | 287 | agentID.ToString())); |
288 | 288 | ||
289 | } | 289 | } |
290 | else | 290 | else |
291 | { | 291 | { |