aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs59
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs4
3 files changed, 60 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
index 715dc4b..d6c9877 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -35,7 +35,6 @@ using OpenSim.Framework.Statistics;
35using OpenSim.Region.Environment.Interfaces; 35using OpenSim.Region.Environment.Interfaces;
36using OpenSim.Region.Environment.Scenes; 36using OpenSim.Region.Environment.Scenes;
37 37
38
39namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload 38namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
40{ 39{
41 /// <summary> 40 /// <summary>
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs
new file mode 100644
index 0000000..4049dfc
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs
@@ -0,0 +1,59 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSim Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using NUnit.Framework;
29using OpenMetaverse;
30using OpenSim.Framework;
31using OpenSim.Tests.Common.Mock;
32
33namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
34{
35 [TestFixture]
36 public class UserTextureSenderTests
37 {
38 [Test]
39 /// <summary>
40 /// More a placeholder, really
41 /// </summary>
42 public void DummyTest()
43 {
44 AgentCircuitData agent = new AgentCircuitData();
45 agent.AgentID = UUID.Random();
46 agent.firstname = "testfirstname";
47 agent.lastname = "testlastname";
48 agent.SessionID = UUID.Zero;
49 agent.SecureSessionID = UUID.Zero;
50 agent.circuitcode = 123;
51 agent.BaseFolder = UUID.Zero;
52 agent.InventoryFolder = UUID.Zero;
53 agent.startpos = Vector3.Zero;
54 agent.CapsPath = "http://wibble.com";
55
56 new TextureSender(new TestClient(agent), 0, 0);
57 }
58 }
59} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index cd61798..57129dd 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
@@ -134,9 +134,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
134 /// <summary> 134 /// <summary>
135 /// Load up the texture data to send. 135 /// Load up the texture data to send.
136 /// </summary> 136 /// </summary>
137 /// <param name="asset"> 137 /// <param name="asset"></param>
138 /// A <see cref="AssetBase"/>
139 /// </param>
140 public void TextureReceived(AssetBase asset) 138 public void TextureReceived(AssetBase asset)
141 { 139 {
142 m_asset = asset; 140 m_asset = asset;