aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2012-09-21 17:59:42 -0700
committerDiva Canto2012-09-21 17:59:42 -0700
commitebd99c9e3ea4170887eaeb60d590659ce32f474c (patch)
treeb2ce3ff6a1b77d7bc8781d1ae4b8d60251974fde
parentThis fixes HG attachments' missing assets (textures, etc). (diff)
parentRemove deprecated parameters for region_id. (diff)
downloadopensim-SC_OLD-ebd99c9e3ea4170887eaeb60d590659ce32f474c.zip
opensim-SC_OLD-ebd99c9e3ea4170887eaeb60d590659ce32f474c.tar.gz
opensim-SC_OLD-ebd99c9e3ea4170887eaeb60d590659ce32f474c.tar.bz2
opensim-SC_OLD-ebd99c9e3ea4170887eaeb60d590659ce32f474c.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs74
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs52
2 files changed, 52 insertions, 74 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index a5e56f9..5d80ba9 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -728,7 +728,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
728 responseData["success"] = true; 728 responseData["success"] = true;
729 responseData["region_name"] = region.RegionName; 729 responseData["region_name"] = region.RegionName;
730 responseData["region_id"] = region.RegionID.ToString(); 730 responseData["region_id"] = region.RegionID.ToString();
731 responseData["region_uuid"] = region.RegionID.ToString(); //Deprecate July 2012
732 731
733 m_log.Info("[RADMIN]: CreateRegion: request complete"); 732 m_log.Info("[RADMIN]: CreateRegion: request complete");
734 } 733 }
@@ -1881,29 +1880,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1881 { 1880 {
1882 return; 1881 return;
1883 } 1882 }
1884 #region Deprecate July 2012
1885 //region_ID, regionid, region_uuid will be deprecated in July 2012!!!!!!
1886 else if (requestData.ContainsKey("regionid") &&
1887 !String.IsNullOrEmpty((string)requestData["regionid"]))
1888 {
1889 m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
1890 }
1891 else if (requestData.ContainsKey("region_ID") &&
1892 !String.IsNullOrEmpty((string)requestData["region_ID"]))
1893 {
1894 m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
1895 }
1896 else if (requestData.ContainsKey("regionID") &&
1897 !String.IsNullOrEmpty((string)requestData["regionID"]))
1898 {
1899 m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
1900 }
1901 else if (requestData.ContainsKey("region_uuid") &&
1902 !String.IsNullOrEmpty((string)requestData["region_uuid"]))
1903 {
1904 m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
1905 }
1906 #endregion
1907 else 1883 else
1908 { 1884 {
1909 responseData["accepted"] = false; 1885 responseData["accepted"] = false;
@@ -1925,56 +1901,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1925 throw new Exception(String.Format("Region ID {0} not found", regionID)); 1901 throw new Exception(String.Format("Region ID {0} not found", regionID));
1926 } 1902 }
1927 } 1903 }
1928 #region Deprecate July 2012
1929 else if (requestData.ContainsKey("regionid") &&
1930 !String.IsNullOrEmpty((string)requestData["regionid"]))
1931 {
1932 m_log.WarnFormat("[RADMIN]: Use of parameter regionid will be deprecated as of July 2012. Use region_id instead");
1933
1934 UUID regionID = (UUID)(string)requestData["regionid"];
1935 if (!m_application.SceneManager.TryGetScene(regionID, out scene))
1936 {
1937 responseData["error"] = String.Format("Region ID {0} not found", regionID);
1938 throw new Exception(String.Format("Region ID {0} not found", regionID));
1939 }
1940 }
1941 else if (requestData.ContainsKey("region_ID") &&
1942 !String.IsNullOrEmpty((string)requestData["region_ID"]))
1943 {
1944 m_log.WarnFormat("[RADMIN]: Use of parameter region_ID will be deprecated as of July 2012. Use region_id instead");
1945
1946 UUID regionID = (UUID)(string)requestData["region_ID"];
1947 if (!m_application.SceneManager.TryGetScene(regionID, out scene))
1948 {
1949 responseData["error"] = String.Format("Region ID {0} not found", regionID);
1950 throw new Exception(String.Format("Region ID {0} not found", regionID));
1951 }
1952 }
1953 else if (requestData.ContainsKey("regionID") &&
1954 !String.IsNullOrEmpty((string)requestData["regionID"]))
1955 {
1956 m_log.WarnFormat("[RADMIN]: Use of parameter regionID will be deprecated as of July 2012. Use region_id instead");
1957
1958 UUID regionID = (UUID)(string)requestData["regionID"];
1959 if (!m_application.SceneManager.TryGetScene(regionID, out scene))
1960 {
1961 responseData["error"] = String.Format("Region ID {0} not found", regionID);
1962 throw new Exception(String.Format("Region ID {0} not found", regionID));
1963 }
1964 }
1965 else if (requestData.ContainsKey("region_uuid") &&
1966 !String.IsNullOrEmpty((string)requestData["region_uuid"]))
1967 {
1968 m_log.WarnFormat("[RADMIN]: Use of parameter region_uuid will be deprecated as of July 2012. Use region_id instead");
1969
1970 UUID regionID = (UUID)(string)requestData["region_uuid"];
1971 if (!m_application.SceneManager.TryGetScene(regionID, out scene))
1972 {
1973 responseData["error"] = String.Format("Region ID {0} not found", regionID);
1974 throw new Exception(String.Format("Region ID {0} not found", regionID));
1975 }
1976 }
1977 #endregion
1978 else if (requestData.ContainsKey("region_name") && 1904 else if (requestData.ContainsKey("region_name") &&
1979 !String.IsNullOrEmpty((string)requestData["region_name"])) 1905 !String.IsNullOrEmpty((string)requestData["region_name"]))
1980 { 1906 {
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index f079e00..96e9797 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -279,6 +279,16 @@ namespace OpenSim.Region.Framework.Scenes
279 /// in <see cref="Scene.ProcessObjectDeGrab"/> 279 /// in <see cref="Scene.ProcessObjectDeGrab"/>
280 /// </remarks> 280 /// </remarks>
281 public event ObjectDeGrabDelegate OnObjectDeGrab; 281 public event ObjectDeGrabDelegate OnObjectDeGrab;
282
283 /// <summary>
284 /// Triggered when a script resets.
285 /// </summary>
286 /// <remarks>
287 /// Triggered by <see cref="TriggerScriptReset"/>
288 /// in <see cref="Scene.ProcessScriptReset"/>
289 /// via <see cref="OpenSim.Framework.IClientAPI.OnScriptReset"/>
290 /// via <see cref="OpenSim.Region.ClientStack.LindenUDP.LLClientView.HandleScriptReset"/>
291 /// </remarks>
282 public event ScriptResetDelegate OnScriptReset; 292 public event ScriptResetDelegate OnScriptReset;
283 293
284 public event OnPermissionErrorDelegate OnPermissionError; 294 public event OnPermissionErrorDelegate OnPermissionError;
@@ -288,17 +298,50 @@ namespace OpenSim.Region.Framework.Scenes
288 /// </summary> 298 /// </summary>
289 /// <remarks> 299 /// <remarks>
290 /// Occurs after OnNewScript. 300 /// Occurs after OnNewScript.
301 /// Triggered by <see cref="TriggerRezScript"/>
302 /// in <see cref="SceneObjectPartInventory.CreateScriptInstance"/>
291 /// </remarks> 303 /// </remarks>
292 public event NewRezScript OnRezScript; 304 public event NewRezScript OnRezScript;
293 public delegate void NewRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource); 305 public delegate void NewRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource);
294 306
295 public delegate void RemoveScript(uint localID, UUID itemID); 307 public delegate void RemoveScript(uint localID, UUID itemID);
308
309 /// <summary>
310 /// Triggered when a script is removed from an object.
311 /// </summary>
312 /// <remarks>
313 /// Triggered by <see cref="TriggerRemoveScript"/>
314 /// in <see cref="Scene.RemoveTaskInventory"/>,
315 /// <see cref="Scene.CreateAgentInventoryItemFromTask"/>,
316 /// <see cref="SceneObjectPartInventory.RemoveScriptInstance"/>,
317 /// <see cref="SceneObjectPartInventory.RemoveInventoryItem"/>
318 /// </remarks>
296 public event RemoveScript OnRemoveScript; 319 public event RemoveScript OnRemoveScript;
297 320
298 public delegate void StartScript(uint localID, UUID itemID); 321 public delegate void StartScript(uint localID, UUID itemID);
322
323 /// <summary>
324 /// Triggered when a script starts.
325 /// </summary>
326 /// <remarks>
327 /// Triggered by <see cref="TriggerStartScript"/>
328 /// in <see cref="Scene.SetScriptRunning"/>
329 /// via <see cref="OpenSim.Framework.IClientAPI.OnSetScriptRunning"/>,
330 /// via <see cref="OpenSim.Region.ClientStack.LindenUDP.HandleSetScriptRunning"/>
331 /// </remarks>
299 public event StartScript OnStartScript; 332 public event StartScript OnStartScript;
300 333
301 public delegate void StopScript(uint localID, UUID itemID); 334 public delegate void StopScript(uint localID, UUID itemID);
335
336 /// <summary>
337 /// Triggered when a script stops.
338 /// </summary>
339 /// <remarks>
340 /// Triggered by <see cref="TriggerStopScript"/>,
341 /// in <see cref="SceneObjectPartInventory.CreateScriptInstance"/>,
342 /// <see cref="SceneObjectPartInventory.StopScriptInstance"/>,
343 /// <see cref="Scene.SetScriptRunning"/>
344 /// </remarks>
302 public event StopScript OnStopScript; 345 public event StopScript OnStopScript;
303 346
304 public delegate bool SceneGroupMoved(UUID groupID, Vector3 delta); 347 public delegate bool SceneGroupMoved(UUID groupID, Vector3 delta);
@@ -349,6 +392,9 @@ namespace OpenSim.Region.Framework.Scenes
349 /// </summary> 392 /// </summary>
350 /// <remarks> 393 /// <remarks>
351 /// Occurs before OnRezScript 394 /// Occurs before OnRezScript
395 /// Triggered by <see cref="TriggerNewScript"/>
396 /// in <see cref="Scene.RezScriptFromAgentInventory"/>,
397 /// <see cref="Scene.RezNewScript"/>
352 /// </remarks> 398 /// </remarks>
353 public event NewScript OnNewScript; 399 public event NewScript OnNewScript;
354 400
@@ -383,6 +429,12 @@ namespace OpenSim.Region.Framework.Scenes
383 /// </summary> 429 /// </summary>
384 /// <remarks> 430 /// <remarks>
385 /// Triggered after the scene receives a client's upload of an updated script and has stored it in an asset. 431 /// Triggered after the scene receives a client's upload of an updated script and has stored it in an asset.
432 /// Triggered by <see cref="TriggerUpdateScript"/>
433 /// in <see cref="Scene.CapsUpdateTaskInventoryScriptAsset"/>
434 /// via <see cref="Scene.CapsUpdateTaskInventoryScriptAsset"/>
435 /// via <see cref="OpenSim.Region.ClientStack.Linden.BunchOfCaps.TaskScriptUpdated"/>
436 /// via <see cref="OpenSim.Region.ClientStack.Linden.TaskInventoryScriptUpdater.OnUpLoad"/>
437 /// via <see cref="OpenSim.Region.ClientStack.Linden.TaskInventoryScriptUpdater.uploaderCaps"/>
386 /// </remarks> 438 /// </remarks>
387 public event UpdateScript OnUpdateScript; 439 public event UpdateScript OnUpdateScript;
388 440