diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs index 671b854..ab86d10 100644 --- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | 31 | ||
32 | using System.Threading; | 32 | using System.Threading; |
33 | using libsecondlife; | 33 | using OpenMetaverse; |
34 | using log4net; | 34 | using log4net; |
35 | using Nini.Config; | 35 | using Nini.Config; |
36 | using OpenSim.Data.Base; | 36 | using OpenSim.Data.Base; |
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
48 | private Scene m_scene = null; | 48 | private Scene m_scene = null; |
49 | private static readonly AvatarAppearance def = new AvatarAppearance(); | 49 | private static readonly AvatarAppearance def = new AvatarAppearance(); |
50 | 50 | ||
51 | public bool TryGetAvatarAppearance(LLUUID avatarId, out AvatarAppearance appearance) | 51 | public bool TryGetAvatarAppearance(UUID avatarId, out AvatarAppearance appearance) |
52 | { | 52 | { |
53 | CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId); | 53 | CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId); |
54 | //if ((profile != null) && (profile.RootFolder != null)) | 54 | //if ((profile != null) && (profile.RootFolder != null)) |
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
69 | 69 | ||
70 | } | 70 | } |
71 | 71 | ||
72 | private AvatarAppearance CreateDefault(LLUUID avatarId) | 72 | private AvatarAppearance CreateDefault(UUID avatarId) |
73 | { | 73 | { |
74 | AvatarAppearance appearance = null; | 74 | AvatarAppearance appearance = null; |
75 | AvatarWearable[] wearables; | 75 | AvatarWearable[] wearables; |
@@ -127,13 +127,13 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
127 | { | 127 | { |
128 | for (int i = 0; i < 13; i++) | 128 | for (int i = 0; i < 13; i++) |
129 | { | 129 | { |
130 | if (appearance.Wearables[i].ItemID == LLUUID.Zero) | 130 | if (appearance.Wearables[i].ItemID == UUID.Zero) |
131 | { | 131 | { |
132 | appearance.Wearables[i].AssetID = LLUUID.Zero; | 132 | appearance.Wearables[i].AssetID = UUID.Zero; |
133 | } | 133 | } |
134 | else | 134 | else |
135 | { | 135 | { |
136 | // LLUUID assetId; | 136 | // UUID assetId; |
137 | 137 | ||
138 | InventoryItemBase baseItem = profile.RootFolder.FindItem(appearance.Wearables[i].ItemID); | 138 | InventoryItemBase baseItem = profile.RootFolder.FindItem(appearance.Wearables[i].ItemID); |
139 | 139 | ||
@@ -201,7 +201,7 @@ namespace OpenSim.Region.Modules.AvatarFactory | |||
201 | wearables = AvatarWearable.DefaultWearables; | 201 | wearables = AvatarWearable.DefaultWearables; |
202 | } | 202 | } |
203 | 203 | ||
204 | public void UpdateDatabase(LLUUID user, AvatarAppearance appearance) | 204 | public void UpdateDatabase(UUID user, AvatarAppearance appearance) |
205 | { | 205 | { |
206 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance); | 206 | m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance); |
207 | } | 207 | } |
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs index a1c1b88..4bab7c9 100644 --- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs +++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser | |||
57 | private string m_svnpass = "password"; | 57 | private string m_svnpass = "password"; |
58 | 58 | ||
59 | private TimeSpan m_svnperiod = new TimeSpan(0, 0, 15, 0, 0); | 59 | private TimeSpan m_svnperiod = new TimeSpan(0, 0, 15, 0, 0); |
60 | private string m_svnurl = "svn://insert.your.svn/here/"; | 60 | private string m_svnurl = "svn://insert.Your.svn/here/"; |
61 | private string m_svnuser = "username"; | 61 | private string m_svnuser = "username"; |
62 | 62 | ||
63 | #region SvnModule Core | 63 | #region SvnModule Core |
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser | |||
117 | public void LoadRegion(Scene scene) | 117 | public void LoadRegion(Scene scene) |
118 | { | 118 | { |
119 | scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + | 119 | scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + |
120 | Slash.DirectorySeparatorChar + "objects.xml"); | 120 | Slash.DirectorySeparatorChar + "objects.Xml"); |
121 | scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + | 121 | scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + |
122 | Slash.DirectorySeparatorChar + "heightmap.r32"); | 122 | Slash.DirectorySeparatorChar + "heightmap.r32"); |
123 | m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ")."); | 123 | m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ")."); |