diff options
author | Sean Dague | 2008-06-25 19:18:51 +0000 |
---|---|---|
committer | Sean Dague | 2008-06-25 19:18:51 +0000 |
commit | 5158aad662f3b6af788c729b3e68f76c92b3279b (patch) | |
tree | 2264484b03db489cf534f0a7be1fca0a664202c3 | |
parent | add migrations to mysql and sqlite for flags on embedded inventory (diff) | |
download | opensim-SC_OLD-5158aad662f3b6af788c729b3e68f76c92b3279b.zip opensim-SC_OLD-5158aad662f3b6af788c729b3e68f76c92b3279b.tar.gz opensim-SC_OLD-5158aad662f3b6af788c729b3e68f76c92b3279b.tar.bz2 opensim-SC_OLD-5158aad662f3b6af788c729b3e68f76c92b3279b.tar.xz |
make lots of properties virtual, which lets nhibernate do
some proxy object optimizations.
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 72 | ||||
-rw-r--r-- | OpenSim/Framework/InventoryFolderBase.cs | 12 | ||||
-rw-r--r-- | OpenSim/Framework/InventoryItemBase.cs | 40 | ||||
-rw-r--r-- | OpenSim/Framework/UserAgentData.cs | 30 | ||||
-rw-r--r-- | OpenSim/Framework/UserProfileData.cs | 58 |
5 files changed, 106 insertions, 106 deletions
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 | |||
71 | 71 | ||
72 | protected LLUUID m_owner; | 72 | protected LLUUID m_owner; |
73 | 73 | ||
74 | public LLUUID Owner | 74 | public virtual LLUUID Owner |
75 | { | 75 | { |
76 | get { return m_owner; } | 76 | get { return m_owner; } |
77 | set { m_owner = value; } | 77 | set { m_owner = value; } |
78 | } | 78 | } |
79 | protected int m_serial = 1; | 79 | protected int m_serial = 1; |
80 | 80 | ||
81 | public int Serial | 81 | public virtual int Serial |
82 | { | 82 | { |
83 | get { return m_serial; } | 83 | get { return m_serial; } |
84 | set { m_serial = value; } | 84 | set { m_serial = value; } |
@@ -86,7 +86,7 @@ namespace OpenSim.Framework | |||
86 | 86 | ||
87 | protected byte[] m_visualparams; | 87 | protected byte[] m_visualparams; |
88 | 88 | ||
89 | public byte[] VisualParams | 89 | public virtual byte[] VisualParams |
90 | { | 90 | { |
91 | get { return m_visualparams; } | 91 | get { return m_visualparams; } |
92 | set { m_visualparams = value; } | 92 | set { m_visualparams = value; } |
@@ -94,118 +94,118 @@ namespace OpenSim.Framework | |||
94 | 94 | ||
95 | protected AvatarWearable[] m_wearables; | 95 | protected AvatarWearable[] m_wearables; |
96 | 96 | ||
97 | public AvatarWearable[] Wearables | 97 | public virtual AvatarWearable[] Wearables |
98 | { | 98 | { |
99 | get { return m_wearables; } | 99 | get { return m_wearables; } |
100 | set { m_wearables = value; } | 100 | set { m_wearables = value; } |
101 | } | 101 | } |
102 | 102 | ||
103 | public LLUUID BodyItem { | 103 | public virtual LLUUID BodyItem { |
104 | get { return m_wearables[BODY].ItemID; } | 104 | get { return m_wearables[BODY].ItemID; } |
105 | set { m_wearables[BODY].ItemID = value; } | 105 | set { m_wearables[BODY].ItemID = value; } |
106 | } | 106 | } |
107 | public LLUUID BodyAsset { | 107 | public virtual LLUUID BodyAsset { |
108 | get { return m_wearables[BODY].AssetID; } | 108 | get { return m_wearables[BODY].AssetID; } |
109 | set { m_wearables[BODY].AssetID = value; } | 109 | set { m_wearables[BODY].AssetID = value; } |
110 | } | 110 | } |
111 | public LLUUID SkinItem { | 111 | public virtual LLUUID SkinItem { |
112 | get { return m_wearables[SKIN].ItemID; } | 112 | get { return m_wearables[SKIN].ItemID; } |
113 | set { m_wearables[SKIN].ItemID = value; } | 113 | set { m_wearables[SKIN].ItemID = value; } |
114 | } | 114 | } |
115 | public LLUUID SkinAsset { | 115 | public virtual LLUUID SkinAsset { |
116 | get { return m_wearables[SKIN].AssetID; } | 116 | get { return m_wearables[SKIN].AssetID; } |
117 | set { m_wearables[SKIN].AssetID = value; } | 117 | set { m_wearables[SKIN].AssetID = value; } |
118 | } | 118 | } |
119 | public LLUUID HairItem { | 119 | public virtual LLUUID HairItem { |
120 | get { return m_wearables[HAIR].ItemID; } | 120 | get { return m_wearables[HAIR].ItemID; } |
121 | set { m_wearables[HAIR].ItemID = value; } | 121 | set { m_wearables[HAIR].ItemID = value; } |
122 | } | 122 | } |
123 | public LLUUID HairAsset { | 123 | public virtual LLUUID HairAsset { |
124 | get { return m_wearables[HAIR].AssetID; } | 124 | get { return m_wearables[HAIR].AssetID; } |
125 | set { m_wearables[HAIR].AssetID = value; } | 125 | set { m_wearables[HAIR].AssetID = value; } |
126 | } | 126 | } |
127 | public LLUUID EyesItem { | 127 | public virtual LLUUID EyesItem { |
128 | get { return m_wearables[EYES].ItemID; } | 128 | get { return m_wearables[EYES].ItemID; } |
129 | set { m_wearables[EYES].ItemID = value; } | 129 | set { m_wearables[EYES].ItemID = value; } |
130 | } | 130 | } |
131 | public LLUUID EyesAsset { | 131 | public virtual LLUUID EyesAsset { |
132 | get { return m_wearables[EYES].AssetID; } | 132 | get { return m_wearables[EYES].AssetID; } |
133 | set { m_wearables[EYES].AssetID = value; } | 133 | set { m_wearables[EYES].AssetID = value; } |
134 | } | 134 | } |
135 | public LLUUID ShirtItem { | 135 | public virtual LLUUID ShirtItem { |
136 | get { return m_wearables[SHIRT].ItemID; } | 136 | get { return m_wearables[SHIRT].ItemID; } |
137 | set { m_wearables[SHIRT].ItemID = value; } | 137 | set { m_wearables[SHIRT].ItemID = value; } |
138 | } | 138 | } |
139 | public LLUUID ShirtAsset { | 139 | public virtual LLUUID ShirtAsset { |
140 | get { return m_wearables[SHIRT].AssetID; } | 140 | get { return m_wearables[SHIRT].AssetID; } |
141 | set { m_wearables[SHIRT].AssetID = value; } | 141 | set { m_wearables[SHIRT].AssetID = value; } |
142 | } | 142 | } |
143 | public LLUUID PantsItem { | 143 | public virtual LLUUID PantsItem { |
144 | get { return m_wearables[PANTS].ItemID; } | 144 | get { return m_wearables[PANTS].ItemID; } |
145 | set { m_wearables[PANTS].ItemID = value; } | 145 | set { m_wearables[PANTS].ItemID = value; } |
146 | } | 146 | } |
147 | public LLUUID PantsAsset { | 147 | public virtual LLUUID PantsAsset { |
148 | get { return m_wearables[PANTS].AssetID; } | 148 | get { return m_wearables[PANTS].AssetID; } |
149 | set { m_wearables[PANTS].AssetID = value; } | 149 | set { m_wearables[PANTS].AssetID = value; } |
150 | } | 150 | } |
151 | public LLUUID ShoesItem { | 151 | public virtual LLUUID ShoesItem { |
152 | get { return m_wearables[SHOES].ItemID; } | 152 | get { return m_wearables[SHOES].ItemID; } |
153 | set { m_wearables[SHOES].ItemID = value; } | 153 | set { m_wearables[SHOES].ItemID = value; } |
154 | } | 154 | } |
155 | public LLUUID ShoesAsset { | 155 | public virtual LLUUID ShoesAsset { |
156 | get { return m_wearables[SHOES].AssetID; } | 156 | get { return m_wearables[SHOES].AssetID; } |
157 | set { m_wearables[SHOES].AssetID = value; } | 157 | set { m_wearables[SHOES].AssetID = value; } |
158 | } | 158 | } |
159 | public LLUUID SocksItem { | 159 | public virtual LLUUID SocksItem { |
160 | get { return m_wearables[SOCKS].ItemID; } | 160 | get { return m_wearables[SOCKS].ItemID; } |
161 | set { m_wearables[SOCKS].ItemID = value; } | 161 | set { m_wearables[SOCKS].ItemID = value; } |
162 | } | 162 | } |
163 | public LLUUID SocksAsset { | 163 | public virtual LLUUID SocksAsset { |
164 | get { return m_wearables[SOCKS].AssetID; } | 164 | get { return m_wearables[SOCKS].AssetID; } |
165 | set { m_wearables[SOCKS].AssetID = value; } | 165 | set { m_wearables[SOCKS].AssetID = value; } |
166 | } | 166 | } |
167 | public LLUUID JacketItem { | 167 | public virtual LLUUID JacketItem { |
168 | get { return m_wearables[JACKET].ItemID; } | 168 | get { return m_wearables[JACKET].ItemID; } |
169 | set { m_wearables[JACKET].ItemID = value; } | 169 | set { m_wearables[JACKET].ItemID = value; } |
170 | } | 170 | } |
171 | public LLUUID JacketAsset { | 171 | public virtual LLUUID JacketAsset { |
172 | get { return m_wearables[JACKET].AssetID; } | 172 | get { return m_wearables[JACKET].AssetID; } |
173 | set { m_wearables[JACKET].AssetID = value; } | 173 | set { m_wearables[JACKET].AssetID = value; } |
174 | } | 174 | } |
175 | public LLUUID GlovesItem { | 175 | public virtual LLUUID GlovesItem { |
176 | get { return m_wearables[GLOVES].ItemID; } | 176 | get { return m_wearables[GLOVES].ItemID; } |
177 | set { m_wearables[GLOVES].ItemID = value; } | 177 | set { m_wearables[GLOVES].ItemID = value; } |
178 | } | 178 | } |
179 | public LLUUID GlovesAsset { | 179 | public virtual LLUUID GlovesAsset { |
180 | get { return m_wearables[GLOVES].AssetID; } | 180 | get { return m_wearables[GLOVES].AssetID; } |
181 | set { m_wearables[GLOVES].AssetID = value; } | 181 | set { m_wearables[GLOVES].AssetID = value; } |
182 | } | 182 | } |
183 | public LLUUID UnderShirtItem { | 183 | public virtual LLUUID UnderShirtItem { |
184 | get { return m_wearables[UNDERSHIRT].ItemID; } | 184 | get { return m_wearables[UNDERSHIRT].ItemID; } |
185 | set { m_wearables[UNDERSHIRT].ItemID = value; } | 185 | set { m_wearables[UNDERSHIRT].ItemID = value; } |
186 | } | 186 | } |
187 | public LLUUID UnderShirtAsset { | 187 | public virtual LLUUID UnderShirtAsset { |
188 | get { return m_wearables[UNDERSHIRT].AssetID; } | 188 | get { return m_wearables[UNDERSHIRT].AssetID; } |
189 | set { m_wearables[UNDERSHIRT].AssetID = value; } | 189 | set { m_wearables[UNDERSHIRT].AssetID = value; } |
190 | } | 190 | } |
191 | public LLUUID UnderPantsItem { | 191 | public virtual LLUUID UnderPantsItem { |
192 | get { return m_wearables[UNDERPANTS].ItemID; } | 192 | get { return m_wearables[UNDERPANTS].ItemID; } |
193 | set { m_wearables[UNDERPANTS].ItemID = value; } | 193 | set { m_wearables[UNDERPANTS].ItemID = value; } |
194 | } | 194 | } |
195 | public LLUUID UnderPantsAsset { | 195 | public virtual LLUUID UnderPantsAsset { |
196 | get { return m_wearables[UNDERPANTS].AssetID; } | 196 | get { return m_wearables[UNDERPANTS].AssetID; } |
197 | set { m_wearables[UNDERPANTS].AssetID = value; } | 197 | set { m_wearables[UNDERPANTS].AssetID = value; } |
198 | } | 198 | } |
199 | public LLUUID SkirtItem { | 199 | public virtual LLUUID SkirtItem { |
200 | get { return m_wearables[SKIRT].ItemID; } | 200 | get { return m_wearables[SKIRT].ItemID; } |
201 | set { m_wearables[SKIRT].ItemID = value; } | 201 | set { m_wearables[SKIRT].ItemID = value; } |
202 | } | 202 | } |
203 | public LLUUID SkirtAsset { | 203 | public virtual LLUUID SkirtAsset { |
204 | get { return m_wearables[SKIRT].AssetID; } | 204 | get { return m_wearables[SKIRT].AssetID; } |
205 | set { m_wearables[SKIRT].AssetID = value; } | 205 | set { m_wearables[SKIRT].AssetID = value; } |
206 | } | 206 | } |
207 | 207 | ||
208 | public void SetDefaultWearables() | 208 | public virtual void SetDefaultWearables() |
209 | { | 209 | { |
210 | m_wearables[BODY].AssetID = BODY_ASSET; | 210 | m_wearables[BODY].AssetID = BODY_ASSET; |
211 | m_wearables[BODY].ItemID = BODY_ITEM; | 211 | m_wearables[BODY].ItemID = BODY_ITEM; |
@@ -219,7 +219,7 @@ namespace OpenSim.Framework | |||
219 | 219 | ||
220 | protected LLObject.TextureEntry m_texture; | 220 | protected LLObject.TextureEntry m_texture; |
221 | 221 | ||
222 | public LLObject.TextureEntry Texture | 222 | public virtual LLObject.TextureEntry Texture |
223 | { | 223 | { |
224 | get { return m_texture; } | 224 | get { return m_texture; } |
225 | set { m_texture = value; } | 225 | set { m_texture = value; } |
@@ -227,7 +227,7 @@ namespace OpenSim.Framework | |||
227 | 227 | ||
228 | protected float m_avatarHeight = 0; | 228 | protected float m_avatarHeight = 0; |
229 | 229 | ||
230 | public float AvatarHeight | 230 | public virtual float AvatarHeight |
231 | { | 231 | { |
232 | get { return m_avatarHeight; } | 232 | get { return m_avatarHeight; } |
233 | set { m_avatarHeight = value; } | 233 | set { m_avatarHeight = value; } |
@@ -262,7 +262,7 @@ namespace OpenSim.Framework | |||
262 | /// </summary> | 262 | /// </summary> |
263 | /// <param name="texture"></param> | 263 | /// <param name="texture"></param> |
264 | /// <param name="visualParam"></param> | 264 | /// <param name="visualParam"></param> |
265 | public void SetAppearance(byte[] texture, List<byte> visualParam) | 265 | public virtual void SetAppearance(byte[] texture, List<byte> visualParam) |
266 | { | 266 | { |
267 | LLObject.TextureEntry textureEnt = new LLObject.TextureEntry(texture, 0, texture.Length); | 267 | LLObject.TextureEntry textureEnt = new LLObject.TextureEntry(texture, 0, texture.Length); |
268 | m_texture = textureEnt; | 268 | m_texture = textureEnt; |
@@ -276,7 +276,7 @@ namespace OpenSim.Framework | |||
276 | + (((float) m_visualparams[125]/255.0f)/1.5f); | 276 | + (((float) m_visualparams[125]/255.0f)/1.5f); |
277 | } | 277 | } |
278 | 278 | ||
279 | public void SetWearable(int wearableId, AvatarWearable wearable) | 279 | public virtual void SetWearable(int wearableId, AvatarWearable wearable) |
280 | { | 280 | { |
281 | m_wearables[wearableId] = wearable; | 281 | m_wearables[wearableId] = wearable; |
282 | } | 282 | } |
@@ -327,7 +327,7 @@ namespace OpenSim.Framework | |||
327 | } | 327 | } |
328 | 328 | ||
329 | // this is used for OGS1 | 329 | // this is used for OGS1 |
330 | public Hashtable ToHashTable() | 330 | public virtual Hashtable ToHashTable() |
331 | { | 331 | { |
332 | Hashtable h = new Hashtable(); | 332 | Hashtable h = new Hashtable(); |
333 | h["owner"] = Owner.ToString(); | 333 | 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 | |||
66 | /// </summary> | 66 | /// </summary> |
67 | private ushort _version; | 67 | private ushort _version; |
68 | 68 | ||
69 | public string Name | 69 | public virtual string Name |
70 | { | 70 | { |
71 | get { return _name; } | 71 | get { return _name; } |
72 | set { _name = value; } | 72 | set { _name = value; } |
73 | } | 73 | } |
74 | 74 | ||
75 | public LLUUID Owner | 75 | public virtual LLUUID Owner |
76 | { | 76 | { |
77 | get { return _owner; } | 77 | get { return _owner; } |
78 | set { _owner = value; } | 78 | set { _owner = value; } |
79 | } | 79 | } |
80 | 80 | ||
81 | public LLUUID ParentID | 81 | public virtual LLUUID ParentID |
82 | { | 82 | { |
83 | get { return _parentID; } | 83 | get { return _parentID; } |
84 | set { _parentID = value; } | 84 | set { _parentID = value; } |
85 | } | 85 | } |
86 | 86 | ||
87 | public LLUUID ID | 87 | public virtual LLUUID ID |
88 | { | 88 | { |
89 | get { return _id; } | 89 | get { return _id; } |
90 | set { _id = value; } | 90 | set { _id = value; } |
91 | } | 91 | } |
92 | 92 | ||
93 | public short Type | 93 | public virtual short Type |
94 | { | 94 | { |
95 | get { return _type; } | 95 | get { return _type; } |
96 | set { _type = value; } | 96 | set { _type = value; } |
97 | } | 97 | } |
98 | 98 | ||
99 | public ushort Version | 99 | public virtual ushort Version |
100 | { | 100 | { |
101 | get { return _version; } | 101 | get { return _version; } |
102 | set { _version = value; } | 102 | 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 | |||
122 | /// <summary> | 122 | /// <summary> |
123 | /// | 123 | /// |
124 | /// </summary> | 124 | /// </summary> |
125 | public int _creationDate; | 125 | private int _creationDate; |
126 | 126 | ||
127 | public LLUUID ID { | 127 | public virtual LLUUID ID { |
128 | get { | 128 | get { |
129 | return _id; | 129 | return _id; |
130 | } | 130 | } |
@@ -133,79 +133,79 @@ namespace OpenSim.Framework | |||
133 | } | 133 | } |
134 | } | 134 | } |
135 | 135 | ||
136 | public int InvType | 136 | public virtual int InvType |
137 | { | 137 | { |
138 | get { return _invType; } | 138 | get { return _invType; } |
139 | set { _invType = value; } | 139 | set { _invType = value; } |
140 | } | 140 | } |
141 | 141 | ||
142 | public LLUUID Folder | 142 | public virtual LLUUID Folder |
143 | { | 143 | { |
144 | get { return _folder; } | 144 | get { return _folder; } |
145 | set { _folder = value; } | 145 | set { _folder = value; } |
146 | } | 146 | } |
147 | 147 | ||
148 | public LLUUID Owner | 148 | public virtual LLUUID Owner |
149 | { | 149 | { |
150 | get { return _owner; } | 150 | get { return _owner; } |
151 | set { _owner = value; } | 151 | set { _owner = value; } |
152 | } | 152 | } |
153 | 153 | ||
154 | public LLUUID Creator | 154 | public virtual LLUUID Creator |
155 | { | 155 | { |
156 | get { return _creator; } | 156 | get { return _creator; } |
157 | set { _creator = value; } | 157 | set { _creator = value; } |
158 | } | 158 | } |
159 | 159 | ||
160 | public string Name | 160 | public virtual string Name |
161 | { | 161 | { |
162 | get { return _name; } | 162 | get { return _name; } |
163 | set { _name = value; } | 163 | set { _name = value; } |
164 | } | 164 | } |
165 | 165 | ||
166 | public string Description | 166 | public virtual string Description |
167 | { | 167 | { |
168 | get { return _description; } | 168 | get { return _description; } |
169 | set { _description = value; } | 169 | set { _description = value; } |
170 | } | 170 | } |
171 | 171 | ||
172 | public uint NextPermissions | 172 | public virtual uint NextPermissions |
173 | { | 173 | { |
174 | get { return _nextPermissions; } | 174 | get { return _nextPermissions; } |
175 | set { _nextPermissions = value; } | 175 | set { _nextPermissions = value; } |
176 | } | 176 | } |
177 | 177 | ||
178 | public uint CurrentPermissions | 178 | public virtual uint CurrentPermissions |
179 | { | 179 | { |
180 | get { return _currentPermissions; } | 180 | get { return _currentPermissions; } |
181 | set { _currentPermissions = value; } | 181 | set { _currentPermissions = value; } |
182 | } | 182 | } |
183 | 183 | ||
184 | public uint BasePermissions | 184 | public virtual uint BasePermissions |
185 | { | 185 | { |
186 | get { return _basePermissions; } | 186 | get { return _basePermissions; } |
187 | set { _basePermissions = value; } | 187 | set { _basePermissions = value; } |
188 | } | 188 | } |
189 | 189 | ||
190 | public uint EveryOnePermissions | 190 | public virtual uint EveryOnePermissions |
191 | { | 191 | { |
192 | get { return _everyOnePermissions; } | 192 | get { return _everyOnePermissions; } |
193 | set { _everyOnePermissions = value; } | 193 | set { _everyOnePermissions = value; } |
194 | } | 194 | } |
195 | 195 | ||
196 | public int AssetType | 196 | public virtual int AssetType |
197 | { | 197 | { |
198 | get { return _assetType; } | 198 | get { return _assetType; } |
199 | set { _assetType = value; } | 199 | set { _assetType = value; } |
200 | } | 200 | } |
201 | 201 | ||
202 | public LLUUID AssetID | 202 | public virtual LLUUID AssetID |
203 | { | 203 | { |
204 | get { return _assetID; } | 204 | get { return _assetID; } |
205 | set { _assetID = value; } | 205 | set { _assetID = value; } |
206 | } | 206 | } |
207 | 207 | ||
208 | public LLUUID GroupID | 208 | public virtual LLUUID GroupID |
209 | { | 209 | { |
210 | get | 210 | get |
211 | { | 211 | { |
@@ -217,7 +217,7 @@ namespace OpenSim.Framework | |||
217 | } | 217 | } |
218 | } | 218 | } |
219 | 219 | ||
220 | public bool GroupOwned | 220 | public virtual bool GroupOwned |
221 | { | 221 | { |
222 | get | 222 | get |
223 | { | 223 | { |
@@ -229,7 +229,7 @@ namespace OpenSim.Framework | |||
229 | } | 229 | } |
230 | } | 230 | } |
231 | 231 | ||
232 | public int SalePrice | 232 | public virtual int SalePrice |
233 | { | 233 | { |
234 | get | 234 | get |
235 | { | 235 | { |
@@ -241,7 +241,7 @@ namespace OpenSim.Framework | |||
241 | } | 241 | } |
242 | } | 242 | } |
243 | 243 | ||
244 | public byte SaleType | 244 | public virtual byte SaleType |
245 | { | 245 | { |
246 | get | 246 | get |
247 | { | 247 | { |
@@ -253,7 +253,7 @@ namespace OpenSim.Framework | |||
253 | } | 253 | } |
254 | } | 254 | } |
255 | 255 | ||
256 | public uint Flags | 256 | public virtual uint Flags |
257 | { | 257 | { |
258 | get | 258 | get |
259 | { | 259 | { |
@@ -265,7 +265,7 @@ namespace OpenSim.Framework | |||
265 | } | 265 | } |
266 | } | 266 | } |
267 | 267 | ||
268 | public int CreationDate | 268 | public virtual int CreationDate |
269 | { | 269 | { |
270 | get | 270 | get |
271 | { | 271 | { |
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 | |||
96 | /// </summary> | 96 | /// </summary> |
97 | private LLUUID UUID; | 97 | private LLUUID UUID; |
98 | 98 | ||
99 | public LLUUID ProfileID | 99 | public virtual LLUUID ProfileID |
100 | { | 100 | { |
101 | get { return UUID; } | 101 | get { return UUID; } |
102 | set { UUID = value; } | 102 | set { UUID = value; } |
103 | } | 103 | } |
104 | 104 | ||
105 | public string AgentIP | 105 | public virtual string AgentIP |
106 | { | 106 | { |
107 | get { return agentIP; } | 107 | get { return agentIP; } |
108 | set { agentIP = value; } | 108 | set { agentIP = value; } |
109 | } | 109 | } |
110 | 110 | ||
111 | public uint AgentPort | 111 | public virtual uint AgentPort |
112 | { | 112 | { |
113 | get { return agentPort; } | 113 | get { return agentPort; } |
114 | set { agentPort = value; } | 114 | set { agentPort = value; } |
115 | } | 115 | } |
116 | 116 | ||
117 | public bool AgentOnline | 117 | public virtual bool AgentOnline |
118 | { | 118 | { |
119 | get { return agentOnline; } | 119 | get { return agentOnline; } |
120 | set { agentOnline = value; } | 120 | set { agentOnline = value; } |
121 | } | 121 | } |
122 | 122 | ||
123 | public LLUUID SessionID | 123 | public virtual LLUUID SessionID |
124 | { | 124 | { |
125 | get { return sessionID; } | 125 | get { return sessionID; } |
126 | set { sessionID = value; } | 126 | set { sessionID = value; } |
127 | } | 127 | } |
128 | 128 | ||
129 | public LLUUID SecureSessionID | 129 | public virtual LLUUID SecureSessionID |
130 | { | 130 | { |
131 | get { return secureSessionID; } | 131 | get { return secureSessionID; } |
132 | set { secureSessionID = value; } | 132 | set { secureSessionID = value; } |
133 | } | 133 | } |
134 | 134 | ||
135 | public LLUUID InitialRegion | 135 | public virtual LLUUID InitialRegion |
136 | { | 136 | { |
137 | get { return regionID; } | 137 | get { return regionID; } |
138 | set { regionID = value; } | 138 | set { regionID = value; } |
139 | } | 139 | } |
140 | 140 | ||
141 | public int LoginTime | 141 | public virtual int LoginTime |
142 | { | 142 | { |
143 | get { return loginTime; } | 143 | get { return loginTime; } |
144 | set { loginTime = value; } | 144 | set { loginTime = value; } |
145 | } | 145 | } |
146 | 146 | ||
147 | public int LogoutTime | 147 | public virtual int LogoutTime |
148 | { | 148 | { |
149 | get { return logoutTime; } | 149 | get { return logoutTime; } |
150 | set { logoutTime = value; } | 150 | set { logoutTime = value; } |
151 | } | 151 | } |
152 | 152 | ||
153 | public LLUUID Region | 153 | public virtual LLUUID Region |
154 | { | 154 | { |
155 | get { return currentRegion; } | 155 | get { return currentRegion; } |
156 | set { currentRegion = value; } | 156 | set { currentRegion = value; } |
157 | } | 157 | } |
158 | 158 | ||
159 | public ulong Handle | 159 | public virtual ulong Handle |
160 | { | 160 | { |
161 | get { return currentHandle; } | 161 | get { return currentHandle; } |
162 | set { currentHandle = value; } | 162 | set { currentHandle = value; } |
163 | } | 163 | } |
164 | 164 | ||
165 | public LLVector3 Position | 165 | public virtual LLVector3 Position |
166 | { | 166 | { |
167 | get { return currentPos; } | 167 | get { return currentPos; } |
168 | set { currentPos = value; } | 168 | set { currentPos = value; } |
169 | } | 169 | } |
170 | 170 | ||
171 | public float PositionX | 171 | public virtual float PositionX |
172 | { | 172 | { |
173 | get { return currentPos.X; } | 173 | get { return currentPos.X; } |
174 | set { currentPos.X = value; } | 174 | set { currentPos.X = value; } |
175 | } | 175 | } |
176 | 176 | ||
177 | public float PositionY | 177 | public virtual float PositionY |
178 | { | 178 | { |
179 | get { return currentPos.Y; } | 179 | get { return currentPos.Y; } |
180 | set { currentPos.Y = value; } | 180 | set { currentPos.Y = value; } |
181 | } | 181 | } |
182 | 182 | ||
183 | public float PositionZ | 183 | public virtual float PositionZ |
184 | { | 184 | { |
185 | get { return currentPos.Z; } | 185 | get { return currentPos.Z; } |
186 | set { currentPos.Z = value; } | 186 | 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 | |||
139 | /// <summary> | 139 | /// <summary> |
140 | /// 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 | 140 | /// 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 |
141 | /// </summary> | 141 | /// </summary> |
142 | public ulong HomeRegion | 142 | public virtual ulong HomeRegion |
143 | { | 143 | { |
144 | get { return Helpers.UIntsToLong((_homeRegionX * (uint) Constants.RegionSize), (_homeRegionY * (uint) Constants.RegionSize)); } | 144 | get { return Helpers.UIntsToLong((_homeRegionX * (uint) Constants.RegionSize), (_homeRegionY * (uint) Constants.RegionSize)); } |
145 | set | 145 | set |
@@ -150,172 +150,172 @@ namespace OpenSim.Framework | |||
150 | } | 150 | } |
151 | 151 | ||
152 | // Property wrappers | 152 | // Property wrappers |
153 | public LLUUID ID | 153 | public virtual LLUUID ID |
154 | { | 154 | { |
155 | get { return _id; } | 155 | get { return _id; } |
156 | set { _id = value; } | 156 | set { _id = value; } |
157 | } | 157 | } |
158 | 158 | ||
159 | public LLUUID WebLoginKey | 159 | public virtual LLUUID WebLoginKey |
160 | { | 160 | { |
161 | get { return _webLoginKey; } | 161 | get { return _webLoginKey; } |
162 | set { _webLoginKey = value; } | 162 | set { _webLoginKey = value; } |
163 | } | 163 | } |
164 | 164 | ||
165 | public string FirstName | 165 | public virtual string FirstName |
166 | { | 166 | { |
167 | get { return _firstname; } | 167 | get { return _firstname; } |
168 | set { _firstname = value; } | 168 | set { _firstname = value; } |
169 | } | 169 | } |
170 | 170 | ||
171 | public string SurName | 171 | public virtual string SurName |
172 | { | 172 | { |
173 | get { return _surname; } | 173 | get { return _surname; } |
174 | set { _surname = value; } | 174 | set { _surname = value; } |
175 | } | 175 | } |
176 | 176 | ||
177 | public string PasswordHash | 177 | public virtual string PasswordHash |
178 | { | 178 | { |
179 | get { return _passwordHash; } | 179 | get { return _passwordHash; } |
180 | set { _passwordHash = value; } | 180 | set { _passwordHash = value; } |
181 | } | 181 | } |
182 | 182 | ||
183 | public string PasswordSalt | 183 | public virtual string PasswordSalt |
184 | { | 184 | { |
185 | get { return _passwordSalt; } | 185 | get { return _passwordSalt; } |
186 | set { _passwordSalt = value; } | 186 | set { _passwordSalt = value; } |
187 | } | 187 | } |
188 | 188 | ||
189 | public uint HomeRegionX | 189 | public virtual uint HomeRegionX |
190 | { | 190 | { |
191 | get { return _homeRegionX; } | 191 | get { return _homeRegionX; } |
192 | set { _homeRegionX = value; } | 192 | set { _homeRegionX = value; } |
193 | } | 193 | } |
194 | 194 | ||
195 | public uint HomeRegionY | 195 | public virtual uint HomeRegionY |
196 | { | 196 | { |
197 | get { return _homeRegionY; } | 197 | get { return _homeRegionY; } |
198 | set { _homeRegionY = value; } | 198 | set { _homeRegionY = value; } |
199 | } | 199 | } |
200 | 200 | ||
201 | public LLVector3 HomeLocation | 201 | public virtual LLVector3 HomeLocation |
202 | { | 202 | { |
203 | get { return _homeLocation; } | 203 | get { return _homeLocation; } |
204 | set { _homeLocation = value; } | 204 | set { _homeLocation = value; } |
205 | } | 205 | } |
206 | 206 | ||
207 | // for handy serialization | 207 | // for handy serialization |
208 | public float HomeLocationX | 208 | public virtual float HomeLocationX |
209 | { | 209 | { |
210 | get { return _homeLocation.X; } | 210 | get { return _homeLocation.X; } |
211 | set { _homeLocation.X = value; } | 211 | set { _homeLocation.X = value; } |
212 | } | 212 | } |
213 | 213 | ||
214 | public float HomeLocationY | 214 | public virtual float HomeLocationY |
215 | { | 215 | { |
216 | get { return _homeLocation.Y; } | 216 | get { return _homeLocation.Y; } |
217 | set { _homeLocation.Y = value; } | 217 | set { _homeLocation.Y = value; } |
218 | } | 218 | } |
219 | 219 | ||
220 | public float HomeLocationZ | 220 | public virtual float HomeLocationZ |
221 | { | 221 | { |
222 | get { return _homeLocation.Z; } | 222 | get { return _homeLocation.Z; } |
223 | set { _homeLocation.Z = value; } | 223 | set { _homeLocation.Z = value; } |
224 | } | 224 | } |
225 | 225 | ||
226 | 226 | ||
227 | public LLVector3 HomeLookAt | 227 | public virtual LLVector3 HomeLookAt |
228 | { | 228 | { |
229 | get { return _homeLookAt; } | 229 | get { return _homeLookAt; } |
230 | set { _homeLookAt = value; } | 230 | set { _homeLookAt = value; } |
231 | } | 231 | } |
232 | 232 | ||
233 | // for handy serialization | 233 | // for handy serialization |
234 | public float HomeLookAtX | 234 | public virtual float HomeLookAtX |
235 | { | 235 | { |
236 | get { return _homeLookAt.X; } | 236 | get { return _homeLookAt.X; } |
237 | set { _homeLookAt.X = value; } | 237 | set { _homeLookAt.X = value; } |
238 | } | 238 | } |
239 | 239 | ||
240 | public float HomeLookAtY | 240 | public virtual float HomeLookAtY |
241 | { | 241 | { |
242 | get { return _homeLookAt.Y; } | 242 | get { return _homeLookAt.Y; } |
243 | set { _homeLookAt.Y = value; } | 243 | set { _homeLookAt.Y = value; } |
244 | } | 244 | } |
245 | 245 | ||
246 | public float HomeLookAtZ | 246 | public virtual float HomeLookAtZ |
247 | { | 247 | { |
248 | get { return _homeLookAt.Z; } | 248 | get { return _homeLookAt.Z; } |
249 | set { _homeLookAt.Z = value; } | 249 | set { _homeLookAt.Z = value; } |
250 | } | 250 | } |
251 | 251 | ||
252 | public int Created | 252 | public virtual int Created |
253 | { | 253 | { |
254 | get { return _created; } | 254 | get { return _created; } |
255 | set { _created = value; } | 255 | set { _created = value; } |
256 | } | 256 | } |
257 | 257 | ||
258 | public int LastLogin | 258 | public virtual int LastLogin |
259 | { | 259 | { |
260 | get { return _lastLogin; } | 260 | get { return _lastLogin; } |
261 | set { _lastLogin = value; } | 261 | set { _lastLogin = value; } |
262 | } | 262 | } |
263 | 263 | ||
264 | public LLUUID RootInventoryFolderID | 264 | public virtual LLUUID RootInventoryFolderID |
265 | { | 265 | { |
266 | get { return _rootInventoryFolderID; } | 266 | get { return _rootInventoryFolderID; } |
267 | set { _rootInventoryFolderID = value; } | 267 | set { _rootInventoryFolderID = value; } |
268 | } | 268 | } |
269 | 269 | ||
270 | public string UserInventoryURI | 270 | public virtual string UserInventoryURI |
271 | { | 271 | { |
272 | get { return _userInventoryURI; } | 272 | get { return _userInventoryURI; } |
273 | set { _userInventoryURI = value; } | 273 | set { _userInventoryURI = value; } |
274 | } | 274 | } |
275 | 275 | ||
276 | public string UserAssetURI | 276 | public virtual string UserAssetURI |
277 | { | 277 | { |
278 | get { return _userAssetURI; } | 278 | get { return _userAssetURI; } |
279 | set { _userAssetURI = value; } | 279 | set { _userAssetURI = value; } |
280 | } | 280 | } |
281 | 281 | ||
282 | public uint CanDoMask | 282 | public virtual uint CanDoMask |
283 | { | 283 | { |
284 | get { return _profileCanDoMask; } | 284 | get { return _profileCanDoMask; } |
285 | set { _profileCanDoMask = value; } | 285 | set { _profileCanDoMask = value; } |
286 | } | 286 | } |
287 | 287 | ||
288 | public uint WantDoMask | 288 | public virtual uint WantDoMask |
289 | { | 289 | { |
290 | get { return _profileWantDoMask; } | 290 | get { return _profileWantDoMask; } |
291 | set { _profileWantDoMask = value; } | 291 | set { _profileWantDoMask = value; } |
292 | } | 292 | } |
293 | 293 | ||
294 | public string AboutText | 294 | public virtual string AboutText |
295 | { | 295 | { |
296 | get { return _profileAboutText; } | 296 | get { return _profileAboutText; } |
297 | set { _profileAboutText = value; } | 297 | set { _profileAboutText = value; } |
298 | } | 298 | } |
299 | 299 | ||
300 | public string FirstLifeAboutText | 300 | public virtual string FirstLifeAboutText |
301 | { | 301 | { |
302 | get { return _profileFirstText; } | 302 | get { return _profileFirstText; } |
303 | set { _profileFirstText = value; } | 303 | set { _profileFirstText = value; } |
304 | } | 304 | } |
305 | 305 | ||
306 | public LLUUID Image | 306 | public virtual LLUUID Image |
307 | { | 307 | { |
308 | get { return _profileImage; } | 308 | get { return _profileImage; } |
309 | set { _profileImage = value; } | 309 | set { _profileImage = value; } |
310 | } | 310 | } |
311 | 311 | ||
312 | public LLUUID FirstLifeImage | 312 | public virtual LLUUID FirstLifeImage |
313 | { | 313 | { |
314 | get { return _profileFirstImage; } | 314 | get { return _profileFirstImage; } |
315 | set { _profileFirstImage = value; } | 315 | set { _profileFirstImage = value; } |
316 | } | 316 | } |
317 | 317 | ||
318 | public UserAgentData CurrentAgent | 318 | public virtual UserAgentData CurrentAgent |
319 | { | 319 | { |
320 | get { return _currentAgent; } | 320 | get { return _currentAgent; } |
321 | set { _currentAgent = value; } | 321 | set { _currentAgent = value; } |