ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

* This is the fabled LibOMV update with all of the libOMV types from JHurliman

Browse Source 
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point.  Regular people should let the dust settle.
* This has been tested to work with most basic functions. However..   make sure you back up 'everything' before using this.  It's that big!  
* Essentially we're back at square 1 in the testing phase..  so lets identify things that broke.
This commit is contained in:
Teravus Ovares
2008-09-06 07:52:41 +00:00
parent cbec2bf22b
commit 7d89e12293
388 changed files with 6811 additions and 7138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
View File

@@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Reflection;
using System.Threading;
using libsecondlife;
using OpenMetaverse;
using log4net;
using Nini.Config;
using OpenSim.Data.Base;
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
private Scene m_scene = null;
private static readonly AvatarAppearance def = new AvatarAppearance();
public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance)
public bool TryGetAvatarAppearance(UUID avatarId, out AvatarAppearance appearance)
{
CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId);
//if ((profile != null) && (profile.RootFolder != null))
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
}
private AvatarAppearance CreateDefault(LLUUID avatarId)
private AvatarAppearance CreateDefault(UUID avatarId)
{
AvatarAppearance appearance = null;
AvatarWearable[] wearables;
@@ -127,13 +127,13 @@ namespace OpenSim.Region.Modules.AvatarFactory
{
for (int i = 0; i < 13; i++)
{
if (appearance.Wearables[i].ItemID == LLUUID.Zero)
if (appearance.Wearables[i].ItemID == UUID.Zero)
{
appearance.Wearables[i].AssetID = LLUUID.Zero;
appearance.Wearables[i].AssetID = UUID.Zero;
}
else
{
// LLUUID assetId;
// UUID assetId;
InventoryItemBase baseItem = profile.RootFolder.FindItem(appearance.Wearables[i].ItemID);
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
wearables = AvatarWearable.DefaultWearables;
}
public void UpdateDatabase(LLUUID user, AvatarAppearance appearance)
public void UpdateDatabase(UUID user, AvatarAppearance appearance)
{
m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance);
}

4
OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
View File

@@ -57,7 +57,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
private string m_svnpass = "password";
private TimeSpan m_svnperiod = new TimeSpan(0, 0, 15, 0, 0);
private string m_svnurl = "svn://insert.your.svn/here/";
private string m_svnurl = "svn://insert.Your.svn/here/";
private string m_svnuser = "username";
#region SvnModule Core
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
public void LoadRegion(Scene scene)
{
scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
Slash.DirectorySeparatorChar + "objects.xml");
Slash.DirectorySeparatorChar + "objects.Xml");
scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
Slash.DirectorySeparatorChar + "heightmap.r32");
m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ").");