diff options
| author | Melanie | 2012-05-13 01:25:03 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-13 01:25:03 +0100 |
| commit | fe029cf4e8fc0940d887329a823e66e0c29bd92e (patch) | |
| tree | 7c2ae75849307cda30da96b6300ee30295610b42 /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | ubitODE fix force in case of mlinear motor offset present (diff) | |
| download | opensim-SC_OLD-fe029cf4e8fc0940d887329a823e66e0c29bd92e.zip opensim-SC_OLD-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.gz opensim-SC_OLD-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.bz2 opensim-SC_OLD-fe029cf4e8fc0940d887329a823e66e0c29bd92e.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 1 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index a37e997..eac8e84 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -669,6 +669,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 669 | public event ObjectDrop OnObjectDrop; | 669 | public event ObjectDrop OnObjectDrop; |
| 670 | public event StartAnim OnStartAnim; | 670 | public event StartAnim OnStartAnim; |
| 671 | public event StopAnim OnStopAnim; | 671 | public event StopAnim OnStopAnim; |
| 672 | public event ChangeAnim OnChangeAnim; | ||
| 672 | public event LinkObjects OnLinkObjects; | 673 | public event LinkObjects OnLinkObjects; |
| 673 | public event DelinkObjects OnDelinkObjects; | 674 | public event DelinkObjects OnDelinkObjects; |
| 674 | public event RequestMapBlocks OnRequestMapBlocks; | 675 | public event RequestMapBlocks OnRequestMapBlocks; |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index c9c12c6..e798382 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -194,6 +194,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 194 | public event ObjectDrop OnObjectDrop; | 194 | public event ObjectDrop OnObjectDrop; |
| 195 | public event StartAnim OnStartAnim; | 195 | public event StartAnim OnStartAnim; |
| 196 | public event StopAnim OnStopAnim; | 196 | public event StopAnim OnStopAnim; |
| 197 | public event ChangeAnim OnChangeAnim; | ||
| 197 | public event LinkObjects OnLinkObjects; | 198 | public event LinkObjects OnLinkObjects; |
| 198 | public event DelinkObjects OnDelinkObjects; | 199 | public event DelinkObjects OnDelinkObjects; |
| 199 | public event RequestMapBlocks OnRequestMapBlocks; | 200 | public event RequestMapBlocks OnRequestMapBlocks; |