diff options
| author | Diva Canto | 2010-07-14 14:48:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-07-14 14:48:14 -0700 |
| commit | 0d8c0811d381951939efd4e2887b872e81a6a34a (patch) | |
| tree | 1424db67347d3e441817cf8860327a8d884b061a /OpenSim/Region/OptionalModules | |
| parent | Removed a few obsolete mono addin references. Mantis #4854 (diff) | |
| parent | Major attachments cleanup. Remove unused AttachObject ClientView method (diff) | |
| download | opensim-SC_OLD-0d8c0811d381951939efd4e2887b872e81a6a34a.zip opensim-SC_OLD-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.gz opensim-SC_OLD-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.bz2 opensim-SC_OLD-0d8c0811d381951939efd4e2887b872e81a6a34a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 5 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 754b925..ee7aa2da 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1055,11 +1055,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1055 | 1055 | ||
| 1056 | } | 1056 | } |
| 1057 | 1057 | ||
| 1058 | public void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID) | ||
| 1059 | { | ||
| 1060 | |||
| 1061 | } | ||
| 1062 | |||
| 1063 | public void SendAvatarDataImmediate(ISceneEntity avatar) | 1058 | public void SendAvatarDataImmediate(ISceneEntity avatar) |
| 1064 | { | 1059 | { |
| 1065 | 1060 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 12d6643..2e0450c 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -627,10 +627,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 627 | { | 627 | { |
| 628 | } | 628 | } |
| 629 | 629 | ||
| 630 | public virtual void AttachObject(uint localID, Quaternion rotation, byte attachPoint, UUID ownerID) | ||
| 631 | { | ||
| 632 | } | ||
| 633 | |||
| 634 | public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) | 630 | public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) |
| 635 | { | 631 | { |
| 636 | } | 632 | } |