From 5158aad662f3b6af788c729b3e68f76c92b3279b Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 25 Jun 2008 19:18:51 +0000
Subject: make lots of properties virtual, which lets nhibernate do some proxy
object optimizations.
---
OpenSim/Framework/AvatarAppearance.cs | 72 ++++++++++++++++----------------
OpenSim/Framework/InventoryFolderBase.cs | 12 +++---
OpenSim/Framework/InventoryItemBase.cs | 40 +++++++++---------
OpenSim/Framework/UserAgentData.cs | 30 ++++++-------
OpenSim/Framework/UserProfileData.cs | 58 ++++++++++++-------------
5 files changed, 106 insertions(+), 106 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 676283c..4456138 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -71,14 +71,14 @@ namespace OpenSim.Framework
protected LLUUID m_owner;
- public LLUUID Owner
+ public virtual LLUUID Owner
{
get { return m_owner; }
set { m_owner = value; }
}
protected int m_serial = 1;
- public int Serial
+ public virtual int Serial
{
get { return m_serial; }
set { m_serial = value; }
@@ -86,7 +86,7 @@ namespace OpenSim.Framework
protected byte[] m_visualparams;
- public byte[] VisualParams
+ public virtual byte[] VisualParams
{
get { return m_visualparams; }
set { m_visualparams = value; }
@@ -94,118 +94,118 @@ namespace OpenSim.Framework
protected AvatarWearable[] m_wearables;
- public AvatarWearable[] Wearables
+ public virtual AvatarWearable[] Wearables
{
get { return m_wearables; }
set { m_wearables = value; }
}
- public LLUUID BodyItem {
+ public virtual LLUUID BodyItem {
get { return m_wearables[BODY].ItemID; }
set { m_wearables[BODY].ItemID = value; }
}
- public LLUUID BodyAsset {
+ public virtual LLUUID BodyAsset {
get { return m_wearables[BODY].AssetID; }
set { m_wearables[BODY].AssetID = value; }
}
- public LLUUID SkinItem {
+ public virtual LLUUID SkinItem {
get { return m_wearables[SKIN].ItemID; }
set { m_wearables[SKIN].ItemID = value; }
}
- public LLUUID SkinAsset {
+ public virtual LLUUID SkinAsset {
get { return m_wearables[SKIN].AssetID; }
set { m_wearables[SKIN].AssetID = value; }
}
- public LLUUID HairItem {
+ public virtual LLUUID HairItem {
get { return m_wearables[HAIR].ItemID; }
set { m_wearables[HAIR].ItemID = value; }
}
- public LLUUID HairAsset {
+ public virtual LLUUID HairAsset {
get { return m_wearables[HAIR].AssetID; }
set { m_wearables[HAIR].AssetID = value; }
}
- public LLUUID EyesItem {
+ public virtual LLUUID EyesItem {
get { return m_wearables[EYES].ItemID; }
set { m_wearables[EYES].ItemID = value; }
}
- public LLUUID EyesAsset {
+ public virtual LLUUID EyesAsset {
get { return m_wearables[EYES].AssetID; }
set { m_wearables[EYES].AssetID = value; }
}
- public LLUUID ShirtItem {
+ public virtual LLUUID ShirtItem {
get { return m_wearables[SHIRT].ItemID; }
set { m_wearables[SHIRT].ItemID = value; }
}
- public LLUUID ShirtAsset {
+ public virtual LLUUID ShirtAsset {
get { return m_wearables[SHIRT].AssetID; }
set { m_wearables[SHIRT].AssetID = value; }
}
- public LLUUID PantsItem {
+ public virtual LLUUID PantsItem {
get { return m_wearables[PANTS].ItemID; }
set { m_wearables[PANTS].ItemID = value; }
}
- public LLUUID PantsAsset {
+ public virtual LLUUID PantsAsset {
get { return m_wearables[PANTS].AssetID; }
set { m_wearables[PANTS].AssetID = value; }
}
- public LLUUID ShoesItem {
+ public virtual LLUUID ShoesItem {
get { return m_wearables[SHOES].ItemID; }
set { m_wearables[SHOES].ItemID = value; }
}
- public LLUUID ShoesAsset {
+ public virtual LLUUID ShoesAsset {
get { return m_wearables[SHOES].AssetID; }
set { m_wearables[SHOES].AssetID = value; }
}
- public LLUUID SocksItem {
+ public virtual LLUUID SocksItem {
get { return m_wearables[SOCKS].ItemID; }
set { m_wearables[SOCKS].ItemID = value; }
}
- public LLUUID SocksAsset {
+ public virtual LLUUID SocksAsset {
get { return m_wearables[SOCKS].AssetID; }
set { m_wearables[SOCKS].AssetID = value; }
}
- public LLUUID JacketItem {
+ public virtual LLUUID JacketItem {
get { return m_wearables[JACKET].ItemID; }
set { m_wearables[JACKET].ItemID = value; }
}
- public LLUUID JacketAsset {
+ public virtual LLUUID JacketAsset {
get { return m_wearables[JACKET].AssetID; }
set { m_wearables[JACKET].AssetID = value; }
}
- public LLUUID GlovesItem {
+ public virtual LLUUID GlovesItem {
get { return m_wearables[GLOVES].ItemID; }
set { m_wearables[GLOVES].ItemID = value; }
}
- public LLUUID GlovesAsset {
+ public virtual LLUUID GlovesAsset {
get { return m_wearables[GLOVES].AssetID; }
set { m_wearables[GLOVES].AssetID = value; }
}
- public LLUUID UnderShirtItem {
+ public virtual LLUUID UnderShirtItem {
get { return m_wearables[UNDERSHIRT].ItemID; }
set { m_wearables[UNDERSHIRT].ItemID = value; }
}
- public LLUUID UnderShirtAsset {
+ public virtual LLUUID UnderShirtAsset {
get { return m_wearables[UNDERSHIRT].AssetID; }
set { m_wearables[UNDERSHIRT].AssetID = value; }
}
- public LLUUID UnderPantsItem {
+ public virtual LLUUID UnderPantsItem {
get { return m_wearables[UNDERPANTS].ItemID; }
set { m_wearables[UNDERPANTS].ItemID = value; }
}
- public LLUUID UnderPantsAsset {
+ public virtual LLUUID UnderPantsAsset {
get { return m_wearables[UNDERPANTS].AssetID; }
set { m_wearables[UNDERPANTS].AssetID = value; }
}
- public LLUUID SkirtItem {
+ public virtual LLUUID SkirtItem {
get { return m_wearables[SKIRT].ItemID; }
set { m_wearables[SKIRT].ItemID = value; }
}
- public LLUUID SkirtAsset {
+ public virtual LLUUID SkirtAsset {
get { return m_wearables[SKIRT].AssetID; }
set { m_wearables[SKIRT].AssetID = value; }
}
- public void SetDefaultWearables()
+ public virtual void SetDefaultWearables()
{
m_wearables[BODY].AssetID = BODY_ASSET;
m_wearables[BODY].ItemID = BODY_ITEM;
@@ -219,7 +219,7 @@ namespace OpenSim.Framework
protected LLObject.TextureEntry m_texture;
- public LLObject.TextureEntry Texture
+ public virtual LLObject.TextureEntry Texture
{
get { return m_texture; }
set { m_texture = value; }
@@ -227,7 +227,7 @@ namespace OpenSim.Framework
protected float m_avatarHeight = 0;
- public float AvatarHeight
+ public virtual float AvatarHeight
{
get { return m_avatarHeight; }
set { m_avatarHeight = value; }
@@ -262,7 +262,7 @@ namespace OpenSim.Framework
/// </summary>
/// <param name="texture"></param>
/// <param name="visualParam"></param>
- public void SetAppearance(byte[] texture, List<byte> visualParam)
+ public virtual void SetAppearance(byte[] texture, List<byte> visualParam)
{
LLObject.TextureEntry textureEnt = new LLObject.TextureEntry(texture, 0, texture.Length);
m_texture = textureEnt;
@@ -276,7 +276,7 @@ namespace OpenSim.Framework
+ (((float) m_visualparams[125]/255.0f)/1.5f);
}
- public void SetWearable(int wearableId, AvatarWearable wearable)
+ public virtual void SetWearable(int wearableId, AvatarWearable wearable)
{
m_wearables[wearableId] = wearable;
}
@@ -327,7 +327,7 @@ namespace OpenSim.Framework
}
// this is used for OGS1
- public Hashtable ToHashTable()
+ public virtual Hashtable ToHashTable()
{
Hashtable h = new Hashtable();
h["owner"] = Owner.ToString();
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index 31bb02f..9c3c116 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.cs
@@ -66,37 +66,37 @@ namespace OpenSim.Framework
/// </summary>
private ushort _version;
- public string Name
+ public virtual string Name
{
get { return _name; }
set { _name = value; }
}
- public LLUUID Owner
+ public virtual LLUUID Owner
{
get { return _owner; }
set { _owner = value; }
}
- public LLUUID ParentID
+ public virtual LLUUID ParentID
{
get { return _parentID; }
set { _parentID = value; }
}
- public LLUUID ID
+ public virtual LLUUID ID
{
get { return _id; }
set { _id = value; }
}
- public short Type
+ public virtual short Type
{
get { return _type; }
set { _type = value; }
}
- public ushort Version
+ public virtual ushort Version
{
get { return _version; }
set { _version = value; }
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index 8d873db..85b08cb 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -122,9 +122,9 @@ namespace OpenSim.Framework
/// <summary>
///
/// </summary>
- public int _creationDate;
+ private int _creationDate;
- public LLUUID ID {
+ public virtual LLUUID ID {
get {
return _id;
}
@@ -133,79 +133,79 @@ namespace OpenSim.Framework
}
}
- public int InvType
+ public virtual int InvType
{
get { return _invType; }
set { _invType = value; }
}
- public LLUUID Folder
+ public virtual LLUUID Folder
{
get { return _folder; }
set { _folder = value; }
}
- public LLUUID Owner
+ public virtual LLUUID Owner
{
get { return _owner; }
set { _owner = value; }
}
- public LLUUID Creator
+ public virtual LLUUID Creator
{
get { return _creator; }
set { _creator = value; }
}
- public string Name
+ public virtual string Name
{
get { return _name; }
set { _name = value; }
}
- public string Description
+ public virtual string Description
{
get { return _description; }
set { _description = value; }
}
- public uint NextPermissions
+ public virtual uint NextPermissions
{
get { return _nextPermissions; }
set { _nextPermissions = value; }
}
- public uint CurrentPermissions
+ public virtual uint CurrentPermissions
{
get { return _currentPermissions; }
set { _currentPermissions = value; }
}
- public uint BasePermissions
+ public virtual uint BasePermissions
{
get { return _basePermissions; }
set { _basePermissions = value; }
}
- public uint EveryOnePermissions
+ public virtual uint EveryOnePermissions
{
get { return _everyOnePermissions; }
set { _everyOnePermissions = value; }
}
- public int AssetType
+ public virtual int AssetType
{
get { return _assetType; }
set { _assetType = value; }
}
- public LLUUID AssetID
+ public virtual LLUUID AssetID
{
get { return _assetID; }
set { _assetID = value; }
}
- public LLUUID GroupID
+ public virtual LLUUID GroupID
{
get
{
@@ -217,7 +217,7 @@ namespace OpenSim.Framework
}
}
- public bool GroupOwned
+ public virtual bool GroupOwned
{
get
{
@@ -229,7 +229,7 @@ namespace OpenSim.Framework
}
}
- public int SalePrice
+ public virtual int SalePrice
{
get
{
@@ -241,7 +241,7 @@ namespace OpenSim.Framework
}
}
- public byte SaleType
+ public virtual byte SaleType
{
get
{
@@ -253,7 +253,7 @@ namespace OpenSim.Framework
}
}
- public uint Flags
+ public virtual uint Flags
{
get
{
@@ -265,7 +265,7 @@ namespace OpenSim.Framework
}
}
- public int CreationDate
+ public virtual int CreationDate
{
get
{
diff --git a/OpenSim/Framework/UserAgentData.cs b/OpenSim/Framework/UserAgentData.cs
index de09ce2..68f47ba 100644
--- a/OpenSim/Framework/UserAgentData.cs
+++ b/OpenSim/Framework/UserAgentData.cs
@@ -96,91 +96,91 @@ namespace OpenSim.Framework
/// </summary>
private LLUUID UUID;
- public LLUUID ProfileID
+ public virtual LLUUID ProfileID
{
get { return UUID; }
set { UUID = value; }
}
- public string AgentIP
+ public virtual string AgentIP
{
get { return agentIP; }
set { agentIP = value; }
}
- public uint AgentPort
+ public virtual uint AgentPort
{
get { return agentPort; }
set { agentPort = value; }
}
- public bool AgentOnline
+ public virtual bool AgentOnline
{
get { return agentOnline; }
set { agentOnline = value; }
}
- public LLUUID SessionID
+ public virtual LLUUID SessionID
{
get { return sessionID; }
set { sessionID = value; }
}
- public LLUUID SecureSessionID
+ public virtual LLUUID SecureSessionID
{
get { return secureSessionID; }
set { secureSessionID = value; }
}
- public LLUUID InitialRegion
+ public virtual LLUUID InitialRegion
{
get { return regionID; }
set { regionID = value; }
}
- public int LoginTime
+ public virtual int LoginTime
{
get { return loginTime; }
set { loginTime = value; }
}
- public int LogoutTime
+ public virtual int LogoutTime
{
get { return logoutTime; }
set { logoutTime = value; }
}
- public LLUUID Region
+ public virtual LLUUID Region
{
get { return currentRegion; }
set { currentRegion = value; }
}
- public ulong Handle
+ public virtual ulong Handle
{
get { return currentHandle; }
set { currentHandle = value; }
}
- public LLVector3 Position
+ public virtual LLVector3 Position
{
get { return currentPos; }
set { currentPos = value; }
}
- public float PositionX
+ public virtual float PositionX
{
get { return currentPos.X; }
set { currentPos.X = value; }
}
- public float PositionY
+ public virtual float PositionY
{
get { return currentPos.Y; }
set { currentPos.Y = value; }
}
- public float PositionZ
+ public virtual float PositionZ
{
get { return currentPos.Z; }
set { currentPos.Z = value; }
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index b704682..17d339e 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Framework
/// <summary>
/// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into
/// </summary>
- public ulong HomeRegion
+ public virtual ulong HomeRegion
{
get { return Helpers.UIntsToLong((_homeRegionX * (uint) Constants.RegionSize), (_homeRegionY * (uint) Constants.RegionSize)); }
set
@@ -150,172 +150,172 @@ namespace OpenSim.Framework
}
// Property wrappers
- public LLUUID ID
+ public virtual LLUUID ID
{
get { return _id; }
set { _id = value; }
}
- public LLUUID WebLoginKey
+ public virtual LLUUID WebLoginKey
{
get { return _webLoginKey; }
set { _webLoginKey = value; }
}
- public string FirstName
+ public virtual string FirstName
{
get { return _firstname; }
set { _firstname = value; }
}
- public string SurName
+ public virtual string SurName
{
get { return _surname; }
set { _surname = value; }
}
- public string PasswordHash
+ public virtual string PasswordHash
{
get { return _passwordHash; }
set { _passwordHash = value; }
}
- public string PasswordSalt
+ public virtual string PasswordSalt
{
get { return _passwordSalt; }
set { _passwordSalt = value; }
}
- public uint HomeRegionX
+ public virtual uint HomeRegionX
{
get { return _homeRegionX; }
set { _homeRegionX = value; }
}
- public uint HomeRegionY
+ public virtual uint HomeRegionY
{
get { return _homeRegionY; }
set { _homeRegionY = value; }
}
- public LLVector3 HomeLocation
+ public virtual LLVector3 HomeLocation
{
get { return _homeLocation; }
set { _homeLocation = value; }
}
// for handy serialization
- public float HomeLocationX
+ public virtual float HomeLocationX
{
get { return _homeLocation.X; }
set { _homeLocation.X = value; }
}
- public float HomeLocationY
+ public virtual float HomeLocationY
{
get { return _homeLocation.Y; }
set { _homeLocation.Y = value; }
}
- public float HomeLocationZ
+ public virtual float HomeLocationZ
{
get { return _homeLocation.Z; }
set { _homeLocation.Z = value; }
}
- public LLVector3 HomeLookAt
+ public virtual LLVector3 HomeLookAt
{
get { return _homeLookAt; }
set { _homeLookAt = value; }
}
// for handy serialization
- public float HomeLookAtX
+ public virtual float HomeLookAtX
{
get { return _homeLookAt.X; }
set { _homeLookAt.X = value; }
}
- public float HomeLookAtY
+ public virtual float HomeLookAtY
{
get { return _homeLookAt.Y; }
set { _homeLookAt.Y = value; }
}
- public float HomeLookAtZ
+ public virtual float HomeLookAtZ
{
get { return _homeLookAt.Z; }
set { _homeLookAt.Z = value; }
}
- public int Created
+ public virtual int Created
{
get { return _created; }
set { _created = value; }
}
- public int LastLogin
+ public virtual int LastLogin
{
get { return _lastLogin; }
set { _lastLogin = value; }
}
- public LLUUID RootInventoryFolderID
+ public virtual LLUUID RootInventoryFolderID
{
get { return _rootInventoryFolderID; }
set { _rootInventoryFolderID = value; }
}
- public string UserInventoryURI
+ public virtual string UserInventoryURI
{
get { return _userInventoryURI; }
set { _userInventoryURI = value; }
}
- public string UserAssetURI
+ public virtual string UserAssetURI
{
get { return _userAssetURI; }
set { _userAssetURI = value; }
}
- public uint CanDoMask
+ public virtual uint CanDoMask
{
get { return _profileCanDoMask; }
set { _profileCanDoMask = value; }
}
- public uint WantDoMask
+ public virtual uint WantDoMask
{
get { return _profileWantDoMask; }
set { _profileWantDoMask = value; }
}
- public string AboutText
+ public virtual string AboutText
{
get { return _profileAboutText; }
set { _profileAboutText = value; }
}
- public string FirstLifeAboutText
+ public virtual string FirstLifeAboutText
{
get { return _profileFirstText; }
set { _profileFirstText = value; }
}
- public LLUUID Image
+ public virtual LLUUID Image
{
get { return _profileImage; }
set { _profileImage = value; }
}
- public LLUUID FirstLifeImage
+ public virtual LLUUID FirstLifeImage
{
get { return _profileFirstImage; }
set { _profileFirstImage = value; }
}
- public UserAgentData CurrentAgent
+ public virtual UserAgentData CurrentAgent
{
get { return _currentAgent; }
set { _currentAgent = value; }
--
cgit v1.1