OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove my UserAppearance object, switch all code to use 

AvatarAppearance instead.
0.6.0-stable
Sean Dague 2008-05-15 18:42:27 +00:00
parent c45218e275
commit 4ff4475d02
10 changed files with 27 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Data/MSSQL/MSSQLUserData.cs
View File

@ -747,12 +747,12 @@ namespace OpenSim.Data.MSSQL
/// Appearance
/// TODO: stubs for now to get us to a compiling state gently
override public UserAppearance GetUserAppearance(LLUUID user)
override public AvatarAppearance GetUserAppearance(LLUUID user)
{
return new UserAppearance();
return new AvatarAppearance();
}
override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
{
return;
}

6
OpenSim/Data/MySQL/MySQLUserData.cs
View File

@ -630,12 +630,12 @@ namespace OpenSim.Data.MySQL
/// Appearance
/// TODO: stubs for now to get us to a compiling state gently
override public UserAppearance GetUserAppearance(LLUUID user)
override public AvatarAppearance GetUserAppearance(LLUUID user)
{
return new UserAppearance();
return new AvatarAppearance();
}
override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
{
return;
}

12
OpenSim/Data/NHibernate/NHibernateUserData.cs
View File

@ -306,29 +306,29 @@ namespace OpenSim.Data.NHibernate
/// Appearance
/// TODO: stubs for now to get us to a compiling state gently
override public UserAppearance GetUserAppearance(LLUUID user)
override public AvatarAppearance GetUserAppearance(LLUUID user)
{
UserAppearance appearance;
AvatarAppearance appearance;
// TODO: I'm sure I'll have to do something silly here
using (ISession session = factory.OpenSession())
{
appearance = session.Load(typeof(UserAppearance), user) as UserAppearance;
appearance = session.Load(typeof(AvatarAppearance), user) as AvatarAppearance;
}
return appearance;
}
private bool ExistsAppearance(LLUUID uuid)
{
UserAppearance appearance;
AvatarAppearance appearance;
using (ISession session = factory.OpenSession())
{
appearance = session.Load(typeof(UserAppearance), uuid) as UserAppearance;
appearance = session.Load(typeof(AvatarAppearance), uuid) as AvatarAppearance;
}
return (appearance == null) ? false : true;
}
override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
{
bool exists = ExistsAppearance(user);
using (ISession session = factory.OpenSession())

6
OpenSim/Data/SQLite/SQLiteUserData.cs
View File

@ -480,12 +480,12 @@ namespace OpenSim.Data.SQLite
/// Appearance
/// TODO: stubs for now to get us to a compiling state gently
override public UserAppearance GetUserAppearance(LLUUID user)
override public AvatarAppearance GetUserAppearance(LLUUID user)
{
return new UserAppearance();
return new AvatarAppearance();
}
override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
{
return;
}

4
OpenSim/Data/UserDataBase.cs
View File

@ -53,8 +53,8 @@ namespace OpenSim.Data
public abstract string Name {get;}
public abstract void Initialise(string connect);
public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
public abstract UserAppearance GetUserAppearance(LLUUID user);
public abstract void UpdateUserAppearance(LLUUID user, UserAppearance appearance);
public abstract AvatarAppearance GetUserAppearance(LLUUID user);
public abstract void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
public abstract void AddAttachment(LLUUID user, LLUUID item);
public abstract void RemoveAttachment(LLUUID user, LLUUID item);
public abstract List<LLUUID> GetAttachments(LLUUID user);

4
OpenSim/Framework/Communications/IUserService.cs
View File

@ -111,9 +111,9 @@ namespace OpenSim.Framework.Communications
/// <summary>
/// Get's the User Appearance
UserAppearance GetUserAppearance(LLUUID user);
AvatarAppearance GetUserAppearance(LLUUID user);
void UpdateUserAppearance(LLUUID user, UserAppearance appearance);
void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
void AddAttachment(LLUUID user, LLUUID attach);

6
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -598,7 +598,7 @@ namespace OpenSim.Framework.Communications
/// Appearance
/// TODO: stubs for now to get us to a compiling state gently
public UserAppearance GetUserAppearance(LLUUID user)
public AvatarAppearance GetUserAppearance(LLUUID user)
{
foreach (KeyValuePair<string, IUserData> plugin in _plugins)
{
@ -611,10 +611,10 @@ namespace OpenSim.Framework.Communications
m_log.InfoFormat("[USERSTORAGE]: Unable to find user appearance {0} via {1} ({2})", user.ToString(), plugin.Key, e.ToString());
}
}
return new UserAppearance();
return new AvatarAppearance();
}
public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
{
foreach (KeyValuePair<string, IUserData> plugin in _plugins)
{

4
OpenSim/Framework/IUserData.cs
View File

@ -178,9 +178,9 @@ namespace OpenSim.Framework
/// <summary>
/// Gets the user appearance
/// </summer>
UserAppearance GetUserAppearance(LLUUID user);
AvatarAppearance GetUserAppearance(LLUUID user);
void UpdateUserAppearance(LLUUID user, UserAppearance appearance);
void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
void AddAttachment(LLUUID user, LLUUID item);

228
OpenSim/Framework/UserAppearance.cs
View File

@ -1,228 +0,0 @@
/*
* 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 OpenSim 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 libsecondlife;
namespace OpenSim.Framework
{
/// <summary>
/// Information about a particular user known to the userserver
/// </summary>
public class UserAppearance
{
// these are guessed at by the list here -
// http://wiki.secondlife.com/wiki/Avatar_Appearance. We'll
// correct them over time for when were are wrong.
public readonly static int BODY = 0;
public readonly static int SKIN = 1;
public readonly static int HAIR = 2;
public readonly static int EYES = 3;
public readonly static int SHIRT = 4;
public readonly static int PANTS = 5;
public readonly static int SHOES = 6;
public readonly static int SOCKS = 7;
public readonly static int JACKET = 8;
public readonly static int GLOVES = 9;
public readonly static int UNDERSHIRT = 10;
public readonly static int UNDERPANTS = 11;
public readonly static int SKIRT = 12;
private readonly static int MAX_WEARABLES = 13;
private static LLUUID BODY_ASSET = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
private static LLUUID BODY_ITEM = new LLUUID("66c41e39-38f9-f75a-024e-585989bfaba9");
private static LLUUID SKIN_ASSET = new LLUUID("77c41e39-38f9-f75a-024e-585989bbabbb");
private static LLUUID SKIN_ITEM = new LLUUID("77c41e39-38f9-f75a-024e-585989bfabc9");
private static LLUUID SHIRT_ASSET = new LLUUID("00000000-38f9-1111-024e-222222111110");
private static LLUUID SHIRT_ITEM = new LLUUID("77c41e39-38f9-f75a-0000-585989bf0000");
private static LLUUID PANTS_ASSET = new LLUUID("00000000-38f9-1111-024e-222222111120");
private static LLUUID PANTS_ITEM = new LLUUID("77c41e39-38f9-f75a-0000-5859892f1111");
public readonly static int VISUALPARAM_COUNT = 218;
private AvatarWearable[] _wearables;
private byte[] _visualParams;
private byte[] _texture;
private LLUUID _user;
private int _serial;
public UserAppearance()
{
_wearables = new AvatarWearable[MAX_WEARABLES];
for (int i = 0; i < MAX_WEARABLES; i++)
{
// this makes them all null
_wearables[i] = new AvatarWearable();
}
_serial = 0;
_user = LLUUID.Zero;
_visualParams = new byte[VISUALPARAM_COUNT];
}
public byte[] Texture {
get { return _texture; }
set { _texture = value; }
}
public byte[] VisualParams {
get { return _visualParams; }
set { _visualParams = value; }
}
public AvatarWearable[] Wearables {
get { return _wearables; }
}
public LLUUID User {
get { return _user; }
set { _user = value; }
}
public int Serial {
get { return _serial; }
set { _serial = value; }
}
public LLUUID BodyItem {
get { return _wearables[BODY].ItemID; }
set { _wearables[BODY].ItemID = value; }
}
public LLUUID BodyAsset {
get { return _wearables[BODY].AssetID; }
set { _wearables[BODY].AssetID = value; }
}
public LLUUID SkinItem {
get { return _wearables[SKIN].ItemID; }
set { _wearables[SKIN].ItemID = value; }
}
public LLUUID SkinAsset {
get { return _wearables[SKIN].AssetID; }
set { _wearables[SKIN].AssetID = value; }
}
public LLUUID HairItem {
get { return _wearables[HAIR].ItemID; }
set { _wearables[HAIR].ItemID = value; }
}
public LLUUID HairAsset {
get { return _wearables[HAIR].AssetID; }
set { _wearables[HAIR].AssetID = value; }
}
public LLUUID EyesItem {
get { return _wearables[EYES].ItemID; }
set { _wearables[EYES].ItemID = value; }
}
public LLUUID EyesAsset {
get { return _wearables[EYES].AssetID; }
set { _wearables[EYES].AssetID = value; }
}
public LLUUID ShirtItem {
get { return _wearables[SHIRT].ItemID; }
set { _wearables[SHIRT].ItemID = value; }
}
public LLUUID ShirtAsset {
get { return _wearables[SHIRT].AssetID; }
set { _wearables[SHIRT].AssetID = value; }
}
public LLUUID PantsItem {
get { return _wearables[PANTS].ItemID; }
set { _wearables[PANTS].ItemID = value; }
}
public LLUUID PantsAsset {
get { return _wearables[BODY].AssetID; }
set { _wearables[BODY].AssetID = value; }
}
public LLUUID ShoesItem {
get { return _wearables[SHOES].ItemID; }
set { _wearables[SHOES].ItemID = value; }
}
public LLUUID ShoesAsset {
get { return _wearables[SHOES].AssetID; }
set { _wearables[SHOES].AssetID = value; }
}
public LLUUID SocksItem {
get { return _wearables[SOCKS].ItemID; }
set { _wearables[SOCKS].ItemID = value; }
}
public LLUUID SocksAsset {
get { return _wearables[SOCKS].AssetID; }
set { _wearables[SOCKS].AssetID = value; }
}
public LLUUID JacketItem {
get { return _wearables[JACKET].ItemID; }
set { _wearables[JACKET].ItemID = value; }
}
public LLUUID JacketAsset {
get { return _wearables[JACKET].AssetID; }
set { _wearables[JACKET].AssetID = value; }
}
public LLUUID GlovesItem {
get { return _wearables[GLOVES].ItemID; }
set { _wearables[GLOVES].ItemID = value; }
}
public LLUUID GlovesAsset {
get { return _wearables[GLOVES].AssetID; }
set { _wearables[GLOVES].AssetID = value; }
}
public LLUUID UnderShirtItem {
get { return _wearables[UNDERSHIRT].ItemID; }
set { _wearables[UNDERSHIRT].ItemID = value; }
}
public LLUUID UnderShirtAsset {
get { return _wearables[UNDERSHIRT].AssetID; }
set { _wearables[UNDERSHIRT].AssetID = value; }
}
public LLUUID UnderPantsItem {
get { return _wearables[UNDERPANTS].ItemID; }
set { _wearables[UNDERPANTS].ItemID = value; }
}
public LLUUID UnderPantsAsset {
get { return _wearables[UNDERPANTS].AssetID; }
set { _wearables[UNDERPANTS].AssetID = value; }
}
public LLUUID SkirtItem {
get { return _wearables[SKIRT].ItemID; }
set { _wearables[SKIRT].ItemID = value; }
}
public LLUUID SkirtAsset {
get { return _wearables[SKIRT].AssetID; }
set { _wearables[SKIRT].AssetID = value; }
}
public void SetDefaultWearables()
{
_wearables[BODY].AssetID = BODY_ASSET;
_wearables[BODY].ItemID = BODY_ITEM;
_wearables[SKIN].AssetID = SKIN_ASSET;
_wearables[SKIN].ItemID = SKIN_ITEM;
_wearables[SHIRT].AssetID = SHIRT_ASSET;
_wearables[SHIRT].ItemID = SHIRT_ITEM;
_wearables[PANTS].AssetID = PANTS_ASSET;
_wearables[PANTS].ItemID = PANTS_ITEM;
}
}
}

6
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -550,12 +550,12 @@ namespace OpenSim.Region.Communications.OGS1
/// Appearance
/// TODO: stubs for now to get us to a compiling state gently
public UserAppearance GetUserAppearance(LLUUID user)
public AvatarAppearance GetUserAppearance(LLUUID user)
{
return new UserAppearance();
return new AvatarAppearance();
}
public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
{
return;
}