aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-07-07 20:52:13 +0000
committerSean Dague2008-07-07 20:52:13 +0000
commitb2febd03f0c6a4e286e022b96683771aa09405bf (patch)
tree05fb246e373b7bffc0fe3c080fcd9e4c6077087f
parentadded skeleton (no function) region store component (diff)
downloadopensim-SC-b2febd03f0c6a4e286e022b96683771aa09405bf.zip
opensim-SC-b2febd03f0c6a4e286e022b96683771aa09405bf.tar.gz
opensim-SC-b2febd03f0c6a4e286e022b96683771aa09405bf.tar.bz2
opensim-SC-b2febd03f0c6a4e286e022b96683771aa09405bf.tar.xz
add NHPrim to subclass SOP so we can stick region uuid in there.
I think the only place we need it is in NHibernate so a subclass is probably appropriate.
-rw-r--r--OpenSim/Data/NHibernate/NHPrim.cs46
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs2
2 files changed, 47 insertions, 1 deletions
diff --git a/OpenSim/Data/NHibernate/NHPrim.cs b/OpenSim/Data/NHibernate/NHPrim.cs
new file mode 100644
index 0000000..9b258ac
--- /dev/null
+++ b/OpenSim/Data/NHibernate/NHPrim.cs
@@ -0,0 +1,46 @@
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 OpenSim 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;
29using libsecondlife;
30using OpenSim.Framework;
31using OpenSim.Region.Environment.Interfaces;
32using OpenSim.Region.Environment.Scenes;
33
34namespace OpenSim.Data.NHibernate
35{
36 class NHPrim : SceneObjectPart
37 {
38 protected LLUUID regionID = LLUUID.Zero;
39
40 public LLUUID RegionID
41 {
42 get { return regionID; }
43 set { regionID = value; }
44 }
45 }
46} \ No newline at end of file
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 2a2745f..9b91f76 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Data.NHibernate
119 /// <param name="regionUUID">the region UUID</param> 119 /// <param name="regionUUID">the region UUID</param>
120 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 120 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID)
121 { 121 {
122 122 NHPrim[] prims = (NHPrim[]) obj.GetParts();
123 } 123 }
124 124
125 /// <summary> 125 /// <summary>