diff --git a/.nant/local.include b/.nant/local.include
index 698af3f993..94f510f96f 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -149,6 +149,11 @@
+
+
+
+
+
@@ -338,6 +343,11 @@
+
+
+
+
+
@@ -347,6 +357,7 @@
+
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs
new file mode 100644
index 0000000000..fd152c35d2
--- /dev/null
+++ b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using log4net;
+using log4net.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Capabilities.Handlers;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Capabilities.Handlers.GetTexture.Tests
+{
+ [TestFixture]
+ public class GetTextureHandlerTests
+ {
+ [Test]
+ public void TestTextureNotFound()
+ {
+ TestHelpers.InMethod();
+
+ // Overkill - we only really need the asset service, not a whole scene.
+ Scene scene = SceneHelpers.SetupScene();
+
+ GetTextureHandler handler = new GetTextureHandler(null, scene.AssetService);
+ TestOSHttpRequest req = new TestOSHttpRequest();
+ TestOSHttpResponse resp = new TestOSHttpResponse();
+ req.Url = new Uri("http://localhost/?texture_id=00000000-0000-1111-9999-000000000012");
+ handler.Handle(null, null, req, resp);
+ Assert.That(resp.StatusCode, Is.EqualTo((int)System.Net.HttpStatusCode.NotFound));
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestOSHttpRequest.cs b/OpenSim/Tests/Common/Mock/TestOSHttpRequest.cs
new file mode 100644
index 0000000000..e769d30707
--- /dev/null
+++ b/OpenSim/Tests/Common/Mock/TestOSHttpRequest.cs
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Web;
+using OpenSim.Framework.Servers.HttpServer;
+
+namespace OpenSim.Tests.Common.Mock
+{
+ public class TestOSHttpRequest : IOSHttpRequest
+ {
+ public string[] AcceptTypes
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public Encoding ContentEncoding
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public long ContentLength
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public long ContentLength64
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public string ContentType
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public HttpCookieCollection Cookies
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public bool HasEntityBody
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public NameValueCollection Headers { get; set; }
+
+ public string HttpMethod
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public Stream InputStream
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public bool IsSecured
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public bool KeepAlive
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public NameValueCollection QueryString
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public Hashtable Query
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public string RawUrl
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public IPEndPoint RemoteIPEndPoint
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public Uri Url { get; set; }
+
+ public string UserAgent
+ {
+ get
+ {
+ throw new NotImplementedException ();
+ }
+ }
+
+ public TestOSHttpRequest()
+ {
+ Headers = new NameValueCollection();
+ }
+ }
+}
\ No newline at end of file
diff --git a/prebuild.xml b/prebuild.xml
index 05d9545004..e951187111 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2729,6 +2729,56 @@
+
+
+
+ ../../../bin/
+
+
+
+
+ ../../../bin/
+
+
+
+ ../../../bin/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+