diff options
author | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-04-30 17:54:00 +0100 |
commit | 89e79c11335d55ae8131d6fa92218bf387e6c48e (patch) | |
tree | bb96e1093123b21e41f52e61000398f82f83f23b /OpenSim/Framework | |
parent | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy (diff) | |
parent | Fix some symbol errors (diff) | |
download | opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.zip opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.gz opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.bz2 opensim-SC-89e79c11335d55ae8131d6fa92218bf387e6c48e.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index af88c4a..01daeb1 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Framework | |||
73 | 73 | ||
74 | public delegate void LinkObjects(IClientAPI remoteClient, uint parent, List<uint> children); | 74 | public delegate void LinkObjects(IClientAPI remoteClient, uint parent, List<uint> children); |
75 | 75 | ||
76 | public delegate void DelinkObjects(List<uint> primIds); | 76 | public delegate void DelinkObjects(List<uint> primIds, IClientAPI client); |
77 | 77 | ||
78 | public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag); | 78 | public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag); |
79 | 79 | ||
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 1208b97..4d1de22 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs | |||
@@ -236,7 +236,7 @@ namespace OpenSim.Framework | |||
236 | catch { } | 236 | catch { } |
237 | 237 | ||
238 | m_log.Warn("[SHAPE]: Failed to decode texture, length=" + ((m_textureEntry != null) ? m_textureEntry.Length : 0)); | 238 | m_log.Warn("[SHAPE]: Failed to decode texture, length=" + ((m_textureEntry != null) ? m_textureEntry.Length : 0)); |
239 | return new Primitive.TextureEntry(null); | 239 | return new Primitive.TextureEntry(UUID.Zero); |
240 | } | 240 | } |
241 | 241 | ||
242 | set { m_textureEntry = value.GetBytes(); } | 242 | set { m_textureEntry = value.GetBytes(); } |
diff --git a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs index 4543fd5..b0cf34d 100644 --- a/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs +++ b/OpenSim/Framework/Servers/HttpServer/SynchronousRestFormsRequester.cs | |||
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
81 | } | 81 | } |
82 | catch (Exception e) | 82 | catch (Exception e) |
83 | { | 83 | { |
84 | m_log.DebugFormat("[FORMS]: exception occured on sending request {0}", e.Message); | 84 | m_log.DebugFormat("[FORMS]: exception occured on sending request to {0}: {1}", requestUrl, e.Message); |
85 | } | 85 | } |
86 | finally | 86 | finally |
87 | { | 87 | { |