aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
authorMW2007-08-01 16:50:20 +0000
committerMW2007-08-01 16:50:20 +0000
commitedc572dacf3ff65c5584f8c02bb291abce0c7122 (patch)
tree0e1c8802d3bb8406883d01a1648b20d36215ec4e /OpenSim/Framework/General
parentremove Adam's work around, this shouldn't be needed any more (diff)
downloadopensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.zip
opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.gz
opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.bz2
opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.xz
Some more work on SceneObject/primitive rewrites (AllNewSceneObjectGroup2 /Part2).
Updated the JavaVM to a later version I did (basically some clean up and a little bit more functional). Added SendLoadURL method to IClientAPI.
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs1
-rw-r--r--OpenSim/Framework/General/NullClientAPI.cs3
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 3162e9c..5320196 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -211,5 +211,6 @@ namespace OpenSim.Framework.Interfaces
211 void SendNameReply(LLUUID profileId, string firstname, string lastname); 211 void SendNameReply(LLUUID profileId, string firstname, string lastname);
212 void SendAlertMessage(string message); 212 void SendAlertMessage(string message);
213 void SendAgentAlertMessage(string message, bool modal); 213 void SendAgentAlertMessage(string message, bool modal);
214 void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url);
214 } 215 }
215} 216}
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 7c6c6689..017828e 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -142,5 +142,8 @@ namespace OpenSim.Framework
142 public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){} 142 public virtual void SendNameReply(LLUUID profileId, string firstname, string lastname){}
143 public void SendAlertMessage(string message) { } 143 public void SendAlertMessage(string message) { }
144 public void SendAgentAlertMessage(string message, bool modal) { } 144 public void SendAgentAlertMessage(string message, bool modal) { }
145 public void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url) { }
146
145 } 147 }
146} 148}
149