aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-02-14 21:11:58 +0000
committerJustin Clark-Casey (justincc)2013-02-14 21:11:58 +0000
commitedb99dcc19d20980ab8fc1a0a272017855e1f266 (patch)
tree51fe428815958706799adb62fca9f6d840e96425 /OpenSim/Region
parentMake new JsonStore script constants separated with underscores, to be consist... (diff)
downloadopensim-SC_OLD-edb99dcc19d20980ab8fc1a0a272017855e1f266.zip
opensim-SC_OLD-edb99dcc19d20980ab8fc1a0a272017855e1f266.tar.gz
opensim-SC_OLD-edb99dcc19d20980ab8fc1a0a272017855e1f266.tar.bz2
opensim-SC_OLD-edb99dcc19d20980ab8fc1a0a272017855e1f266.tar.xz
Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and JsonArrayLength() -> JsonGetArrayLength()
This is for consistentency with the verb:noun naming approach existing json script functions and other script functions. Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions. As agreed with cmickeyb
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs8
3 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
index d7907e3..b40d24f 100644
--- a/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IJsonStoreModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Interfaces
49 bool CreateStore(string value, ref UUID result); 49 bool CreateStore(string value, ref UUID result);
50 bool DestroyStore(UUID storeID); 50 bool DestroyStore(UUID storeID);
51 51
52 JsonStoreNodeType PathType(UUID storeID, string path); 52 JsonStoreNodeType GetPathType(UUID storeID, string path);
53 bool TestStore(UUID storeID); 53 bool TestStore(UUID storeID);
54 bool TestPath(UUID storeID, string path, bool useJson); 54 bool TestPath(UUID storeID, string path, bool useJson);
55 55
@@ -60,6 +60,6 @@ namespace OpenSim.Region.Framework.Interfaces
60 void TakeValue(UUID storeID, string path, bool useJson, TakeValueCallback cback); 60 void TakeValue(UUID storeID, string path, bool useJson, TakeValueCallback cback);
61 void ReadValue(UUID storeID, string path, bool useJson, TakeValueCallback cback); 61 void ReadValue(UUID storeID, string path, bool useJson, TakeValueCallback cback);
62 62
63 int ArrayLength(UUID storeID, string path); 63 int GetArrayLength(UUID storeID, string path);
64 } 64 }
65} 65}
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index eec86ef..fb35068 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -270,7 +270,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
270 /// 270 ///
271 /// </summary> 271 /// </summary>
272 // ----------------------------------------------------------------- 272 // -----------------------------------------------------------------
273 public JsonStoreNodeType PathType(UUID storeID, string path) 273 public JsonStoreNodeType GetPathType(UUID storeID, string path)
274 { 274 {
275 if (! m_enabled) return JsonStoreNodeType.Undefined; 275 if (! m_enabled) return JsonStoreNodeType.Undefined;
276 276
@@ -407,7 +407,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
407 /// 407 ///
408 /// </summary> 408 /// </summary>
409 // ----------------------------------------------------------------- 409 // -----------------------------------------------------------------
410 public int ArrayLength(UUID storeID, string path) 410 public int GetArrayLength(UUID storeID, string path)
411 { 411 {
412 if (! m_enabled) return -1; 412 if (! m_enabled) return -1;
413 413
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 669d752..1ed7df7 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -336,9 +336,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
336 /// </summary> 336 /// </summary>
337 // ----------------------------------------------------------------- 337 // -----------------------------------------------------------------
338 [ScriptInvocation] 338 [ScriptInvocation]
339 public int JsonPathType(UUID hostID, UUID scriptID, UUID storeID, string path) 339 public int JsonGetPathType(UUID hostID, UUID scriptID, UUID storeID, string path)
340 { 340 {
341 return (int)m_store.PathType(storeID,path); 341 return (int)m_store.GetPathType(storeID,path);
342 } 342 }
343 343
344 [ScriptInvocation] 344 [ScriptInvocation]
@@ -387,9 +387,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
387 /// </summary> 387 /// </summary>
388 // ----------------------------------------------------------------- 388 // -----------------------------------------------------------------
389 [ScriptInvocation] 389 [ScriptInvocation]
390 public int JsonArrayLength(UUID hostID, UUID scriptID, UUID storeID, string path) 390 public int JsonGetArrayLength(UUID hostID, UUID scriptID, UUID storeID, string path)
391 { 391 {
392 return m_store.ArrayLength(storeID,path); 392 return m_store.GetArrayLength(storeID,path);
393 } 393 }
394 394
395 // ----------------------------------------------------------------- 395 // -----------------------------------------------------------------