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

git merge

0.6.0-stable
Sean Dague 2008-07-17 18:59:06 +00:00
parent 1c0f27b013
commit dd144e12ba
4 changed files with 5 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Data/NHibernate/NHibernateRegionData.cs
View File

@ -26,7 +26,6 @@
*/ */
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
@ -113,33 +112,6 @@ namespace OpenSim.Data.NHibernate
{ {
return null; return null;
} }
private void SaveOrUpdate(SceneObjectPart p)
{
try
{
ICriteria criteria = session.CreateCriteria(typeof(SceneObjectPart));
criteria.Add(Expression.Eq("UUID", p.UUID));
if (criteria.List().Count < 1)
{
session.Save(p);
}
else if (criteria.List().Count == 1)
{
SceneObjectPart old = (SceneObjectPart)criteria.List()[0];
session.Evict(old);
session.Update(p);
}
else
{
m_log.Error("Not unique");
}
}
catch (Exception e)
{
m_log.Error("[NHIBERNATE] issue saving asset", e);
}
}
/// <summary> /// <summary>
/// Adds an object into region storage /// Adds an object into region storage
@ -153,7 +125,7 @@ namespace OpenSim.Data.NHibernate
foreach (SceneObjectPart part in obj.Children.Values) foreach (SceneObjectPart part in obj.Children.Values)
{ {
m_log.InfoFormat("Storing part {0}", part.UUID); m_log.InfoFormat("Storing part {0}", part.UUID);
SaveOrUpdate(part); session.SaveOrUpdate(part);
} }
session.Flush(); session.Flush();
} }

21
OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
View File

@ -82,26 +82,7 @@
<column name="ScaleY" /> <column name="ScaleY" />
<column name="ScaleZ" /> <column name="ScaleZ" />
</property> </property>
<property name="PCode" type="System.Byte" />
<property name="PathBegin" type="System.UInt16" />
<property name="PathEnd" type="System.UInt16" />
<property name="PathScaleX" type="System.Byte" />
<property name="PathScaleY" type="System.Byte" />
<property name="PathShearX" type="System.Byte" />
<property name="PathShearY" type="System.Byte" />
<property name="PathSkew" type="System.SByte" />
<property name="PathCurve" type="System.Byte" />
<property name="PathRadiusOffset" type="System.SByte" />
<property name="PathRevolutions" type="System.Byte" />
<property name="PathTaperX" type="System.SByte" />
<property name="PathTwist" type="System.SByte" />
<property name="ProfileBegin" type="System.UInt16" />
<property name="ProfileEnd" type="System.UInt16" />
<property name="ProfileCurve" type="System.Byte" />
<property name="ProfileHollow" type="System.UInt16" />
<property name="TextureEntry" column="Texture" type="System.Byte[]" />
<property name="ExtraParams" type="System.Byte[]" />
<property name="State" type="System.Byte" />
</component> </component>
</class> </class>

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

@ -49,16 +49,8 @@ namespace OpenSim.Data.NHibernate
public object DeepCopy(object texture) public object DeepCopy(object texture)
{ {
if (texture == null) byte[] bytes = ((LLObject.TextureEntry)texture).ToBytes();
{ return new LLObject.TextureEntry(bytes, 0, bytes.Length);
// TODO: should parametrize this texture out
return new LLObject.TextureEntry(new LLUUID("89556747-24cb-43ed-920b-47caed15465f"));
}
else
{
byte[] bytes = ((LLObject.TextureEntry)texture).ToBytes();
return new LLObject.TextureEntry(bytes, 0, bytes.Length);
}
} }
public object Disassemble(object texture) public object Disassemble(object texture)

11
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -197,13 +197,7 @@ namespace OpenSim.Framework
{ {
get { return m_textureEntry; } get { return m_textureEntry; }
set set { m_textureEntry = value; }
{
if (value == null)
m_textureEntry = new byte[1];
else
m_textureEntry = value;
}
} }
@ -844,9 +838,6 @@ namespace OpenSim.Framework
public void ReadInExtraParamsBytes(byte[] data) public void ReadInExtraParamsBytes(byte[] data)
{ {
if (data == null)
return;
const ushort FlexiEP = 0x10; const ushort FlexiEP = 0x10;
const ushort LightEP = 0x20; const ushort LightEP = 0x20;
const ushort SculptEP = 0x30; const ushort SculptEP = 0x30;