aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMW2008-06-28 17:43:20 +0000
committerMW2008-06-28 17:43:20 +0000
commita9347b6ceb194a352ad2a5796e7ed7e8fc598c26 (patch)
tree2392880066755967ae0716a0d06b44247025e510 /OpenSim
parentComment out StringTest until we use it somewhere. (diff)
downloadopensim-SC_OLD-a9347b6ceb194a352ad2a5796e7ed7e8fc598c26.zip
opensim-SC_OLD-a9347b6ceb194a352ad2a5796e7ed7e8fc598c26.tar.gz
opensim-SC_OLD-a9347b6ceb194a352ad2a5796e7ed7e8fc598c26.tar.bz2
opensim-SC_OLD-a9347b6ceb194a352ad2a5796e7ed7e8fc598c26.tar.xz
Extracted the Avatar appearance functions out of the IUserService interface and moved them into a IAvatarService
Although "out of the box", there is no actual functional change to behavior
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs7
-rw-r--r--OpenSim/Framework/Communications/IUserService.cs10
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs1
-rw-r--r--OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs6
6 files changed, 19 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 0410f0e..45f692b 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -77,6 +77,13 @@ namespace OpenSim.Framework.Communications
77 // get { return m_transactionsManager; } 77 // get { return m_transactionsManager; }
78 // } 78 // }
79 79
80 protected IAvatarService m_avatarService;
81
82 public IAvatarService AvatarService
83 {
84 get { return m_avatarService; }
85 }
86
80 protected AssetCache m_assetCache; 87 protected AssetCache m_assetCache;
81 88
82 public AssetCache AssetCache 89 public AssetCache AssetCache
diff --git a/OpenSim/Framework/Communications/IUserService.cs b/OpenSim/Framework/Communications/IUserService.cs
index f8ef358..4bd2ad1 100644
--- a/OpenSim/Framework/Communications/IUserService.cs
+++ b/OpenSim/Framework/Communications/IUserService.cs
@@ -120,14 +120,14 @@ namespace OpenSim.Framework.Communications
120 120
121 /// <summary> 121 /// <summary>
122 /// Get's the User Appearance 122 /// Get's the User Appearance
123 AvatarAppearance GetUserAppearance(LLUUID user); 123 // AvatarAppearance GetUserAppearance(LLUUID user);
124 124
125 void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance); 125 // void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
126 126
127 void AddAttachment(LLUUID user, LLUUID attach); 127 // void AddAttachment(LLUUID user, LLUUID attach);
128 128
129 void RemoveAttachment(LLUUID user, LLUUID attach); 129 // void RemoveAttachment(LLUUID user, LLUUID attach);
130 130
131 List<LLUUID> GetAttachments(LLUUID user); 131 // List<LLUUID> GetAttachments(LLUUID user);
132 } 132 }
133} \ No newline at end of file 133} \ No newline at end of file
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index 2065006..5fd5524 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -47,6 +47,7 @@ namespace OpenSim.Region.Communications.Local
47 AddInventoryService( inventoryService); 47 AddInventoryService( inventoryService);
48 m_defaultInventoryHost = inventoryService.Host; 48 m_defaultInventoryHost = inventoryService.Host;
49 m_userService = userService; 49 m_userService = userService;
50 m_avatarService = (IAvatarService)userService;
50 m_gridService = gridService; 51 m_gridService = gridService;
51 m_interRegion = interRegionService; 52 m_interRegion = interRegionService;
52 } 53 }
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index b85654d..f2e76f2 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -46,6 +46,7 @@ namespace OpenSim.Region.Communications.OGS1
46 m_defaultInventoryHost = invService.Host; 46 m_defaultInventoryHost = invService.Host;
47 47
48 m_userService = new OGS1UserServices(this); 48 m_userService = new OGS1UserServices(this);
49 m_avatarService = (IAvatarService)m_userService;
49 } 50 }
50 51
51 public override void AddInventoryService(string hostUrl) 52 public override void AddInventoryService(string hostUrl)
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 7ba096b..3a966f4 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1661,7 +1661,7 @@ namespace OpenSim.Region.Environment.Scenes
1661 m_log.Info("[APPEARANCE] Setting Appearance"); 1661 m_log.Info("[APPEARANCE] Setting Appearance");
1662 m_appearance.SetAppearance(texture, visualParam); 1662 m_appearance.SetAppearance(texture, visualParam);
1663 SetHeight(m_appearance.AvatarHeight); 1663 SetHeight(m_appearance.AvatarHeight);
1664 m_scene.CommsManager.UserService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); 1664 m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance);
1665 1665
1666 SendAppearanceToAllOtherAgents(); 1666 SendAppearanceToAllOtherAgents();
1667 SendOwnAppearance(); 1667 SendOwnAppearance();
@@ -1671,7 +1671,7 @@ namespace OpenSim.Region.Environment.Scenes
1671 { 1671 {
1672 m_log.Info("[APPEARANCE] Setting Wearable"); 1672 m_log.Info("[APPEARANCE] Setting Wearable");
1673 m_appearance.SetWearable(wearableId, wearable); 1673 m_appearance.SetWearable(wearableId, wearable);
1674 m_scene.CommsManager.UserService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); 1674 m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance);
1675 m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); 1675 m_controllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
1676 } 1676 }
1677 1677
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index 43b492a..671b854 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
54 //if ((profile != null) && (profile.RootFolder != null)) 54 //if ((profile != null) && (profile.RootFolder != null))
55 if (profile != null) 55 if (profile != null)
56 { 56 {
57 appearance = m_scene.CommsManager.UserService.GetUserAppearance(avatarId); 57 appearance = m_scene.CommsManager.AvatarService.GetUserAppearance(avatarId);
58 if (appearance != null) 58 if (appearance != null)
59 { 59 {
60 //SetAppearanceAssets(profile, ref appearance); 60 //SetAppearanceAssets(profile, ref appearance);
@@ -185,7 +185,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
185 } 185 }
186 SetAppearanceAssets(profile, ref avatAppearance); 186 SetAppearanceAssets(profile, ref avatAppearance);
187 187
188 m_scene.CommsManager.UserService.UpdateUserAppearance(clientView.AgentId, avatAppearance); 188 m_scene.CommsManager.AvatarService.UpdateUserAppearance(clientView.AgentId, avatAppearance);
189 avatar.Appearance = avatAppearance; 189 avatar.Appearance = avatAppearance;
190 } 190 }
191 else 191 else
@@ -203,7 +203,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
203 203
204 public void UpdateDatabase(LLUUID user, AvatarAppearance appearance) 204 public void UpdateDatabase(LLUUID user, AvatarAppearance appearance)
205 { 205 {
206 m_scene.CommsManager.UserService.UpdateUserAppearance(user, appearance); 206 m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance);
207 } 207 }
208 208
209 private static byte[] GetDefaultVisualParams() 209 private static byte[] GetDefaultVisualParams()