diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs index fca2830..90ef6ef 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs | |||
@@ -39,7 +39,7 @@ using System; | |||
39 | using System.Collections; | 39 | using System.Collections; |
40 | using System.Collections.Generic; | 40 | using System.Collections.Generic; |
41 | 41 | ||
42 | using libsecondlife; | 42 | using OpenMetaverse; |
43 | 43 | ||
44 | using OpenSim; | 44 | using OpenSim; |
45 | using OpenSim.Framework; | 45 | using OpenSim.Framework; |
@@ -49,8 +49,6 @@ using OpenSim.Region.Physics.Manager; | |||
49 | 49 | ||
50 | using log4net; | 50 | using log4net; |
51 | 51 | ||
52 | using Axiom.Math; | ||
53 | |||
54 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 52 | namespace OpenSim.Region.Environment.Modules.ContentManagement |
55 | { | 53 | { |
56 | public class CMView | 54 | public class CMView |
@@ -136,7 +134,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
136 | SendSimChatMessage(scene, menu); | 134 | SendSimChatMessage(scene, menu); |
137 | } | 135 | } |
138 | 136 | ||
139 | public void DisplayMetaEntity(LLUUID uuid) | 137 | public void DisplayMetaEntity(UUID uuid) |
140 | { | 138 | { |
141 | ContentManagementEntity group = m_model.GetMetaGroupByPrim(uuid); | 139 | ContentManagementEntity group = m_model.GetMetaGroupByPrim(uuid); |
142 | if (group != null) | 140 | if (group != null) |
@@ -199,10 +197,10 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
199 | 197 | ||
200 | public void SendSimChatMessage(Scene scene, string message) | 198 | public void SendSimChatMessage(Scene scene, string message) |
201 | { | 199 | { |
202 | scene.SimChat(Helpers.StringToField(message), | 200 | scene.SimChat(Utils.StringToBytes(message), |
203 | ChatTypeEnum.Broadcast, 0, new LLVector3(0,0,0), "Content Manager", LLUUID.Zero, false); | 201 | ChatTypeEnum.Broadcast, 0, new Vector3(0,0,0), "Content Manager", UUID.Zero, false); |
204 | } | 202 | } |
205 | 203 | ||
206 | #endregion Public Methods | 204 | #endregion Public Methods |
207 | } | 205 | } |
208 | } \ No newline at end of file | 206 | } |