aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authorJeff Ames2009-04-24 00:58:48 +0000
committerJeff Ames2009-04-24 00:58:48 +0000
commit8afeee9ff6905781824237e0ddd4235b4d921ef8 (patch)
treee701c0356b5a75685d2678e982bf331b0b0e0aa9 /OpenSim/Client
parent* refactor: move archive user inventory item serialization out to a separate ... (diff)
downloadopensim-SC_OLD-8afeee9ff6905781824237e0ddd4235b4d921ef8.zip
opensim-SC_OLD-8afeee9ff6905781824237e0ddd4235b4d921ef8.tar.gz
opensim-SC_OLD-8afeee9ff6905781824237e0ddd4235b4d921ef8.tar.bz2
opensim-SC_OLD-8afeee9ff6905781824237e0ddd4235b4d921ef8.tar.xz
Update svn properties, add copyright headers, formatting cleanup.
Diffstat (limited to 'OpenSim/Client')
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs35
-rw-r--r--OpenSim/Client/VWoHTTP/VWoHTTPModule.cs31
2 files changed, 60 insertions, 6 deletions
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 3ac4164..314bbe4 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -1,4 +1,31 @@
1using System; 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 OpenSimulator 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 System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Drawing; 30using System.Drawing;
4using System.Drawing.Imaging; 31using System.Drawing.Imaging;
@@ -30,7 +57,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
30 if (!UUID.TryParse(urlparts[1], out sessionID)) 57 if (!UUID.TryParse(urlparts[1], out sessionID))
31 return false; 58 return false;
32 // Check we match session 59 // Check we match session
33 if(sessionID != SessionId) 60 if (sessionID != SessionId)
34 return false; 61 return false;
35 62
36 string method = urlparts[2]; 63 string method = urlparts[2];
@@ -57,12 +84,12 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
57 private bool ProcessTextureRequest(string param, OSHttpResponse resp) 84 private bool ProcessTextureRequest(string param, OSHttpResponse resp)
58 { 85 {
59 UUID assetID; 86 UUID assetID;
60 if(!UUID.TryParse(param, out assetID)) 87 if (!UUID.TryParse(param, out assetID))
61 return false; 88 return false;
62 89
63 AssetBase asset = m_scene.CommsManager.AssetCache.GetAsset(assetID, true); 90 AssetBase asset = m_scene.CommsManager.AssetCache.GetAsset(assetID, true);
64 91
65 if(asset == null) 92 if (asset == null)
66 return false; 93 return false;
67 94
68 ManagedImage tmp; 95 ManagedImage tmp;
diff --git a/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs b/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
index c5b5c09..8f7fc1b 100644
--- a/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
+++ b/OpenSim/Client/VWoHTTP/VWoHTTPModule.cs
@@ -1,4 +1,31 @@
1using System; 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 OpenSimulator 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 System;
2using System.Collections.Generic; 29using System.Collections.Generic;
3using System.Text; 30using System.Text;
4using Nini.Config; 31using Nini.Config;
@@ -25,7 +52,7 @@ namespace OpenSim.Client.VWoHTTP
25 52
26 public void Initialise(Scene scene, IConfigSource source) 53 public void Initialise(Scene scene, IConfigSource source)
27 { 54 {
28 if(m_disabled) 55 if (m_disabled)
29 return; 56 return;
30 57
31 m_scenes.Add(scene); 58 m_scenes.Add(scene);