diff options
| author | Mic Bowman | 2011-08-05 11:13:02 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-05 11:13:02 -0700 |
| commit | c3f579046c4de7a5a65e71e4c02958425fd7998a (patch) | |
| tree | b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/Region/Examples | |
| parent | BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff) | |
| parent | remove the largely unused copy/pasted HandleAgentRequestSit() method (diff) | |
| download | opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/Examples')
| -rw-r--r-- | OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 56b46d7..4f58ab0 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
| @@ -222,7 +222,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
| 222 | public event ScriptReset OnScriptReset; | 222 | public event ScriptReset OnScriptReset; |
| 223 | public event GetScriptRunning OnGetScriptRunning; | 223 | public event GetScriptRunning OnGetScriptRunning; |
| 224 | public event SetScriptRunning OnSetScriptRunning; | 224 | public event SetScriptRunning OnSetScriptRunning; |
| 225 | public event UpdateVector OnAutoPilotGo; | 225 | public event Action<Vector3> OnAutoPilotGo; |
| 226 | 226 | ||
| 227 | public event TerrainUnacked OnUnackedTerrain; | 227 | public event TerrainUnacked OnUnackedTerrain; |
| 228 | 228 | ||
| @@ -1152,7 +1152,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
| 1152 | { | 1152 | { |
| 1153 | } | 1153 | } |
| 1154 | 1154 | ||
| 1155 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | 1155 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId) |
| 1156 | { | 1156 | { |
| 1157 | } | 1157 | } |
| 1158 | 1158 | ||