diff options
| author | Melanie | 2012-04-25 18:55:51 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-25 18:55:51 +0100 |
| commit | b62eee2f0b2587ea59dd8fc4513a1fd7d863a5e2 (patch) | |
| tree | a43a418df6515432b3999e1c10b120e36c0e45b5 /OpenSim | |
| parent | Adapt some TeleportWithMomentum calls (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-b62eee2f0b2587ea59dd8fc4513a1fd7d863a5e2.zip opensim-SC-b62eee2f0b2587ea59dd8fc4513a1fd7d863a5e2.tar.gz opensim-SC-b62eee2f0b2587ea59dd8fc4513a1fd7d863a5e2.tar.bz2 opensim-SC-b62eee2f0b2587ea59dd8fc4513a1fd7d863a5e2.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs index eda2aef..4949097 100644 --- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs | |||
| @@ -163,28 +163,37 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
| 163 | return; | 163 | return; |
| 164 | } | 164 | } |
| 165 | 165 | ||
| 166 | m_comms.RegisterScriptInvocation(this,"JsonCreateStore"); | 166 | try |
| 167 | m_comms.RegisterScriptInvocation(this,"JsonDestroyStore"); | 167 | { |
| 168 | m_comms.RegisterScriptInvocation(this,"JsonCreateStore"); | ||
| 169 | m_comms.RegisterScriptInvocation(this,"JsonDestroyStore"); | ||
| 168 | 170 | ||
| 169 | m_comms.RegisterScriptInvocation(this,"JsonReadNotecard"); | 171 | m_comms.RegisterScriptInvocation(this,"JsonReadNotecard"); |
| 170 | m_comms.RegisterScriptInvocation(this,"JsonWriteNotecard"); | 172 | m_comms.RegisterScriptInvocation(this,"JsonWriteNotecard"); |
| 171 | 173 | ||
| 172 | m_comms.RegisterScriptInvocation(this,"JsonTestPath"); | 174 | m_comms.RegisterScriptInvocation(this,"JsonTestPath"); |
| 173 | m_comms.RegisterScriptInvocation(this,"JsonTestPathJson"); | 175 | m_comms.RegisterScriptInvocation(this,"JsonTestPathJson"); |
| 174 | 176 | ||
| 175 | m_comms.RegisterScriptInvocation(this,"JsonGetValue"); | 177 | m_comms.RegisterScriptInvocation(this,"JsonGetValue"); |
| 176 | m_comms.RegisterScriptInvocation(this,"JsonGetValueJson"); | 178 | m_comms.RegisterScriptInvocation(this,"JsonGetValueJson"); |
| 177 | 179 | ||
| 178 | m_comms.RegisterScriptInvocation(this,"JsonTakeValue"); | 180 | m_comms.RegisterScriptInvocation(this,"JsonTakeValue"); |
| 179 | m_comms.RegisterScriptInvocation(this,"JsonTakeValueJson"); | 181 | m_comms.RegisterScriptInvocation(this,"JsonTakeValueJson"); |
| 180 | 182 | ||
| 181 | m_comms.RegisterScriptInvocation(this,"JsonReadValue"); | 183 | m_comms.RegisterScriptInvocation(this,"JsonReadValue"); |
| 182 | m_comms.RegisterScriptInvocation(this,"JsonReadValueJson"); | 184 | m_comms.RegisterScriptInvocation(this,"JsonReadValueJson"); |
| 183 | 185 | ||
| 184 | m_comms.RegisterScriptInvocation(this,"JsonSetValue"); | 186 | m_comms.RegisterScriptInvocation(this,"JsonSetValue"); |
| 185 | m_comms.RegisterScriptInvocation(this,"JsonSetValueJson"); | 187 | m_comms.RegisterScriptInvocation(this,"JsonSetValueJson"); |
| 186 | 188 | ||
| 187 | m_comms.RegisterScriptInvocation(this,"JsonRemoveValue"); | 189 | m_comms.RegisterScriptInvocation(this,"JsonRemoveValue"); |
| 190 | } | ||
| 191 | catch (Exception e) | ||
| 192 | { | ||
| 193 | // See http://opensimulator.org/mantis/view.php?id=5971 for more information | ||
| 194 | m_log.WarnFormat("[JsonStroreScripts] script method registration failed; {0}",e.Message); | ||
| 195 | m_enabled = false; | ||
| 196 | } | ||
| 188 | } | 197 | } |
| 189 | } | 198 | } |
| 190 | 199 | ||