diff options
| author | Melanie | 2011-10-11 21:22:58 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 21:22:58 +0100 |
| commit | 9d22110c239c008059aa825cf51c1cb302a72b26 (patch) | |
| tree | 520494099fe8491187f35dd656a0bac3451a2e3a /OpenSim/Region | |
| parent | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge (diff) | |
| parent | Write code to create minimum necessary body parts/clothing and avatar entries... (diff) | |
| download | opensim-SC-9d22110c239c008059aa825cf51c1cb302a72b26.zip opensim-SC-9d22110c239c008059aa825cf51c1cb302a72b26.tar.gz opensim-SC-9d22110c239c008059aa825cf51c1cb302a72b26.tar.bz2 opensim-SC-9d22110c239c008059aa825cf51c1cb302a72b26.tar.xz | |
Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index b6a1564..c5a1828 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -467,7 +467,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 467 | return; | 467 | return; |
| 468 | } | 468 | } |
| 469 | 469 | ||
| 470 | // m_log.WarnFormat("[AVFACTORY]: Received request for wearables of {0}", client.AgentId); | 470 | // m_log.DebugFormat("[AVFACTORY]: Received request for wearables of {0}", client.Name); |
| 471 | 471 | ||
| 472 | client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++); | 472 | client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++); |
| 473 | } | 473 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c5bb2b2..74ae47a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -1265,6 +1265,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1265 | first, last); | 1265 | first, last); |
| 1266 | 1266 | ||
| 1267 | 1267 | ||
| 1268 | |||
| 1268 | m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", first, last); | 1269 | m_log.InfoFormat("[USER ACCOUNT SERVICE]: Account {0} {1} created successfully", first, last); |
| 1269 | 1270 | ||
| 1270 | m_regInfo.EstateSettings.EstateOwner = account.PrincipalID; | 1271 | m_regInfo.EstateSettings.EstateOwner = account.PrincipalID; |