diff options
author | Justin Clark-Casey (justincc) | 2010-06-23 01:22:42 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-23 01:22:42 +0100 |
commit | 1719dc9a9b6f87c006c04997005e83c66b134075 (patch) | |
tree | 686d63018385842ace3a614fdd1a05d16806ed63 /OpenSim/Region | |
parent | add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch to... (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.zip opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.tar.gz opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.tar.bz2 opensim-SC-1719dc9a9b6f87c006c04997005e83c66b134075.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
3 files changed, 29 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs index f8e3d59..75efb79 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | |||
@@ -131,6 +131,12 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
131 | 131 | ||
132 | if (texture != null) | 132 | if (texture != null) |
133 | { | 133 | { |
134 | if (texture.Type != (sbyte)AssetType.Texture) | ||
135 | { | ||
136 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; | ||
137 | httpResponse.Send(); | ||
138 | return null; | ||
139 | } | ||
134 | SendTexture(httpRequest, httpResponse, texture); | 140 | SendTexture(httpRequest, httpResponse, texture); |
135 | } | 141 | } |
136 | else | 142 | else |
@@ -147,6 +153,12 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
147 | 153 | ||
148 | if (texture != null) | 154 | if (texture != null) |
149 | { | 155 | { |
156 | if (texture.Type != (sbyte)AssetType.Texture) | ||
157 | { | ||
158 | httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound; | ||
159 | httpResponse.Send(); | ||
160 | return null; | ||
161 | } | ||
150 | SendTexture(httpRequest, httpResponse, texture); | 162 | SendTexture(httpRequest, httpResponse, texture); |
151 | } | 163 | } |
152 | else | 164 | else |
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs index 7b7677b..de3c360 100644 --- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs +++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs | |||
@@ -52,6 +52,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
52 | public double GetUpdatePriority(IClientAPI client, ISceneEntity entity) | 52 | public double GetUpdatePriority(IClientAPI client, ISceneEntity entity) |
53 | { | 53 | { |
54 | double priority = 0; | 54 | double priority = 0; |
55 | |||
56 | if (entity == null) | ||
57 | return 100000; | ||
55 | 58 | ||
56 | switch (m_scene.UpdatePrioritizationScheme) | 59 | switch (m_scene.UpdatePrioritizationScheme) |
57 | { | 60 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 86d0c30..1feb153 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6516,15 +6516,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6516 | if (cut.y > 1f) | 6516 | if (cut.y > 1f) |
6517 | { | 6517 | { |
6518 | cut.y = 1f; | 6518 | cut.y = 1f; |
6519 | } | 6519 | } |
6520 | if (cut.y - cut.x < 0.05f) | 6520 | if (cut.y - cut.x < 0.05f) |
6521 | { | 6521 | { |
6522 | cut.x = cut.y - 0.05f; | 6522 | cut.x = cut.y - 0.05f; |
6523 | if (cut.x < 0.0f) | 6523 | if (cut.x < 0.0f) |
6524 | { | 6524 | { |
6525 | cut.x = 0.0f; | 6525 | cut.x = 0.0f; |
6526 | cut.y = 0.05f; | 6526 | cut.y = 0.05f; |
6527 | } | 6527 | } |
6528 | } | 6528 | } |
6529 | shapeBlock.ProfileBegin = (ushort)(50000 * cut.x); | 6529 | shapeBlock.ProfileBegin = (ushort)(50000 * cut.x); |
6530 | shapeBlock.ProfileEnd = (ushort)(50000 * (1 - cut.y)); | 6530 | shapeBlock.ProfileEnd = (ushort)(50000 * (1 - cut.y)); |
@@ -6722,11 +6722,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6722 | } | 6722 | } |
6723 | if (profilecut.y - profilecut.x < 0.05f) | 6723 | if (profilecut.y - profilecut.x < 0.05f) |
6724 | { | 6724 | { |
6725 | profilecut.x = profilecut.y - 0.05f; | 6725 | profilecut.x = profilecut.y - 0.05f; |
6726 | if (profilecut.x < 0.0f) | 6726 | if (profilecut.x < 0.0f) |
6727 | { | 6727 | { |
6728 | profilecut.x = 0.0f; | 6728 | profilecut.x = 0.0f; |
6729 | profilecut.y = 0.05f; | 6729 | profilecut.y = 0.05f; |
6730 | } | 6730 | } |
6731 | } | 6731 | } |
6732 | shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x); | 6732 | shapeBlock.ProfileBegin = (ushort)(50000 * profilecut.x); |