Update svn properties, add copyright headers, formatting cleanup.

This commit is contained in:
Jeff Ames
2009-04-24 00:58:48 +00:00
parent 1ccc99a3f9
commit 8afeee9ff6
4 changed files with 64 additions and 23 deletions

View File

@@ -1,4 +1,31 @@
using System;
/*
* 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.Drawing;
using System.Drawing.Imaging;
@@ -30,7 +57,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
if (!UUID.TryParse(urlparts[1], out sessionID))
return false;
// Check we match session
if(sessionID != SessionId)
if (sessionID != SessionId)
return false;
string method = urlparts[2];
@@ -57,12 +84,12 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
private bool ProcessTextureRequest(string param, OSHttpResponse resp)
{
UUID assetID;
if(!UUID.TryParse(param, out assetID))
if (!UUID.TryParse(param, out assetID))
return false;
AssetBase asset = m_scene.CommsManager.AssetCache.GetAsset(assetID, true);
if(asset == null)
if (asset == null)
return false;
ManagedImage tmp;