aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-05-23 12:23:16 -0700
committerDiva Canto2010-05-23 12:23:16 -0700
commit30e94cd0753809094b9b01b664e0ae643db28492 (patch)
tree4a76c17218f68ff6aeeb43524b3298b2107e74fc /OpenSim
parentThe 8th migration statement in AssetStore.migrations didn't look right. (diff)
parentRemove an unneeded conditional (diff)
downloadopensim-SC_OLD-30e94cd0753809094b9b01b664e0ae643db28492.zip
opensim-SC_OLD-30e94cd0753809094b9b01b664e0ae643db28492.tar.gz
opensim-SC_OLD-30e94cd0753809094b9b01b664e0ae643db28492.tar.bz2
opensim-SC_OLD-30e94cd0753809094b9b01b664e0ae643db28492.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs4
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs4
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs15
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs5
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs28
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs54
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs5
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs5
12 files changed, 130 insertions, 7 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 3e92658..d742039 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -931,6 +931,10 @@ namespace OpenSim.Client.MXP.ClientStack
931 // Need to translate to MXP somehow 931 // Need to translate to MXP somehow
932 } 932 }
933 933
934 public void SendGenericMessage(string method, List<string> message)
935 {
936 }
937
934 public void SendGenericMessage(string method, List<byte[]> message) 938 public void SendGenericMessage(string method, List<byte[]> message)
935 { 939 {
936 // Need to translate to MXP somehow 940 // Need to translate to MXP somehow
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index c293480..d725943 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -504,6 +504,10 @@ namespace OpenSim.Client.Sirikata.ClientStack
504 throw new System.NotImplementedException(); 504 throw new System.NotImplementedException();
505 } 505 }
506 506
507 public void SendGenericMessage(string method, List<string> message)
508 {
509 }
510
507 public void SendGenericMessage(string method, List<byte[]> message) 511 public void SendGenericMessage(string method, List<byte[]> message)
508 { 512 {
509 throw new System.NotImplementedException(); 513 throw new System.NotImplementedException();
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 51026ab..2eec844 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -510,6 +510,10 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
510 throw new System.NotImplementedException(); 510 throw new System.NotImplementedException();
511 } 511 }
512 512
513 public void SendGenericMessage(string method, List<string> message)
514 {
515 }
516
513 public void SendGenericMessage(string method, List<byte[]> message) 517 public void SendGenericMessage(string method, List<byte[]> message)
514 { 518 {
515 throw new System.NotImplementedException(); 519 throw new System.NotImplementedException();
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index f51bf71..c1333fc 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -983,6 +983,7 @@ namespace OpenSim.Framework
983 983
984 void SendInstantMessage(GridInstantMessage im); 984 void SendInstantMessage(GridInstantMessage im);
985 985
986 void SendGenericMessage(string method, List<string> message);
986 void SendGenericMessage(string method, List<byte[]> message); 987 void SendGenericMessage(string method, List<byte[]> message);
987 988
988 void SendLayerData(float[] map); 989 void SendLayerData(float[] map);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 9eb35fa..e67428d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -816,6 +816,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
816 } 816 }
817 } 817 }
818 818
819 public void SendGenericMessage(string method, List<string> message)
820 {
821 GenericMessagePacket gmp = new GenericMessagePacket();
822 gmp.MethodData.Method = Util.StringToBytes256(method);
823 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
824 int i = 0;
825 foreach (string val in message)
826 {
827 gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock();
828 gmp.ParamList[i++].Parameter = Util.StringToBytes256(val);
829 }
830
831 OutPacket(gmp, ThrottleOutPacketType.Task);
832 }
833
819 public void SendGenericMessage(string method, List<byte[]> message) 834 public void SendGenericMessage(string method, List<byte[]> message)
820 { 835 {
821 GenericMessagePacket gmp = new GenericMessagePacket(); 836 GenericMessagePacket gmp = new GenericMessagePacket();
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 967438f..2681d4f 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -461,6 +461,10 @@ namespace OpenSim.Region.Examples.SimpleModule
461 461
462 } 462 }
463 463
464 public void SendGenericMessage(string method, List<string> message)
465 {
466 }
467
464 public void SendGenericMessage(string method, List<byte[]> message) 468 public void SendGenericMessage(string method, List<byte[]> message)
465 { 469 {
466 470
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 2ce1b68..3964b0b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1312,8 +1312,7 @@ namespace OpenSim.Region.Framework.Scenes
1312 // Setting parent ID would fix this, if we knew what value 1312 // Setting parent ID would fix this, if we knew what value
1313 // to use. Or we could add a m_isSitting variable. 1313 // to use. Or we could add a m_isSitting variable.
1314 //Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED"); 1314 //Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
1315 SitGround = true; 1315 SitGround = true;
1316
1317 } 1316 }
1318 1317
1319 // In the future, these values might need to go global. 1318 // In the future, these values might need to go global.
@@ -1330,7 +1329,7 @@ namespace OpenSim.Region.Framework.Scenes
1330 1329
1331 bool update_movementflag = false; 1330 bool update_movementflag = false;
1332 1331
1333 if (m_allowMovement) 1332 if (m_allowMovement && !SitGround)
1334 { 1333 {
1335 if (agentData.UseClientAgentPosition) 1334 if (agentData.UseClientAgentPosition)
1336 { 1335 {
@@ -1672,8 +1671,7 @@ namespace OpenSim.Region.Framework.Scenes
1672 /// </summary> 1671 /// </summary>
1673 public void StandUp() 1672 public void StandUp()
1674 { 1673 {
1675 if (SitGround) 1674 SitGround = false;
1676 SitGround = false;
1677 1675
1678 if (m_parentID != 0) 1676 if (m_parentID != 0)
1679 { 1677 {
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 27de529..7453eae 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -965,6 +965,11 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
965 // TODO 965 // TODO
966 } 966 }
967 967
968 public void SendGenericMessage(string method, List<string> message)
969 {
970
971 }
972
968 public void SendGenericMessage(string method, List<byte[]> message) 973 public void SendGenericMessage(string method, List<byte[]> message)
969 { 974 {
970 975
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
index 30580e7..e189489 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
@@ -98,6 +98,16 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
98 String Description { get; set; } 98 String Description { get; set; }
99 99
100 /// <summary> 100 /// <summary>
101 /// Returns the UUID of the Owner of the Object.
102 /// </summary>
103 UUID OwnerId { get; }
104
105 /// <summary>
106 /// Returns the UUID of the Creator of the Object.
107 /// </summary>
108 UUID CreatorId { get; }
109
110 /// <summary>
101 /// Returns the root object of a linkset. If this object is the root, it will return itself. 111 /// Returns the root object of a linkset. If this object is the root, it will return itself.
102 /// </summary> 112 /// </summary>
103 IObject Root { get; } 113 IObject Root { get; }
@@ -179,9 +189,25 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
179 /// </summary> 189 /// </summary>
180 /// <param name="msg">The message to send to the user</param> 190 /// <param name="msg">The message to send to the user</param>
181 void Say(string msg); 191 void Say(string msg);
182 192
193 /// <summary>
194 /// Causes the object to speak to on a specific channel,
195 /// equivilent to LSL/OSSL llSay
196 /// </summary>
197 /// <param name="msg">The message to send to the user</param>
198 /// <param name="channel">The channel on which to send the message</param>
183 void Say(string msg,int channel); 199 void Say(string msg,int channel);
184 200
201 /// <summary>
202 /// Opens a Dialog Panel in the Users Viewer,
203 /// equivilent to LSL/OSSL llDialog
204 /// </summary>
205 /// <param name="avatar">The UUID of the Avatar to which the Dialog should be send</param>
206 /// <param name="message">The Message to display at the top of the Dialog</param>
207 /// <param name="buttons">The Strings that act as label/value of the Bottons in the Dialog</param>
208 /// <param name="chat_channel">The channel on which to send the response</param>
209 void Dialog(UUID avatar, string message, string[] buttons, int chat_channel);
210
185 //// <value> 211 //// <value>
186 /// Grants access to the objects inventory 212 /// Grants access to the objects inventory
187 /// </value> 213 /// </value>
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index 5bfe4be..96cccb7 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -31,6 +31,7 @@ using System.Security;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
35using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object; 36using OpenSim.Region.OptionalModules.Scripting.Minimodule.Object;
36using OpenSim.Region.Physics.Manager; 37using OpenSim.Region.Physics.Manager;
@@ -169,6 +170,16 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
169 } 170 }
170 } 171 }
171 172
173 public UUID OwnerId
174 {
175 get { return GetSOP().OwnerID;}
176 }
177
178 public UUID CreatorId
179 {
180 get { return GetSOP().CreatorID;}
181 }
182
172 public IObject[] Children 183 public IObject[] Children
173 { 184 {
174 get 185 get
@@ -392,7 +403,48 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
392 SceneObjectPart sop = GetSOP(); 403 SceneObjectPart sop = GetSOP();
393 m_rootScene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,channel, sop.AbsolutePosition, sop.Name, sop.UUID, false); 404 m_rootScene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,channel, sop.AbsolutePosition, sop.Name, sop.UUID, false);
394 } 405 }
395 406
407 public void Dialog(UUID avatar, string message, string[] buttons, int chat_channel)
408 {
409 if (!CanEdit())
410 return;
411
412 IDialogModule dm = m_rootScene.RequestModuleInterface<IDialogModule>();
413
414 if (dm == null)
415 return;
416
417 if (buttons.Length < 1)
418 {
419 Say("ERROR: No less than 1 button can be shown",2147483647);
420 return;
421 }
422 if (buttons.Length > 12)
423 {
424 Say("ERROR: No more than 12 buttons can be shown",2147483647);
425 return;
426 }
427
428 foreach(string button in buttons)
429 {
430 if (button == String.Empty)
431 {
432 Say("ERROR: button label cannot be blank",2147483647);
433 return;
434 }
435 if (button.Length > 24)
436 {
437 Say("ERROR: button label cannot be longer than 24 characters",2147483647);
438 return;
439 }
440 }
441
442 dm.SendDialogToUser(
443 avatar, GetSOP().Name, GetSOP().UUID, GetSOP().OwnerID,
444 message, new UUID("00000000-0000-2222-3333-100000001000"), chat_channel, buttons);
445
446 }
447
396 #endregion 448 #endregion
397 449
398 450
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index d2279c7..146b3d6 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -551,6 +551,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
551 551
552 } 552 }
553 553
554 public void SendGenericMessage(string method, List<string> message)
555 {
556
557 }
558
554 public void SendGenericMessage(string method, List<byte[]> message) 559 public void SendGenericMessage(string method, List<byte[]> message)
555 { 560 {
556 561
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 6b0efe9..94d9d72 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -519,6 +519,11 @@ namespace OpenSim.Tests.Common.Mock
519 519
520 } 520 }
521 521
522 public void SendGenericMessage(string method, List<string> message)
523 {
524
525 }
526
522 public void SendGenericMessage(string method, List<byte[]> message) 527 public void SendGenericMessage(string method, List<byte[]> message)
523 { 528 {
524 529