diff options
| author | Melanie Thielker | 2014-08-20 04:39:48 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-08-20 04:39:48 +0200 |
| commit | 24b4f6ad7b9e9b54b3efb80aec462fa03e226c32 (patch) | |
| tree | 3128c12ea30a35b30caaf598a8a023c5987d279d /OpenSim/Region/OptionalModules | |
| parent | Expect a missing directory, the asset cache is shared. Prevent spew if (diff) | |
| parent | also send attachment pre-kills on crossings (diff) | |
| download | opensim-SC-24b4f6ad7b9e9b54b3efb80aec462fa03e226c32.zip opensim-SC-24b4f6ad7b9e9b54b3efb80aec462fa03e226c32.tar.gz opensim-SC-24b4f6ad7b9e9b54b3efb80aec462fa03e226c32.tar.bz2 opensim-SC-24b4f6ad7b9e9b54b3efb80aec462fa03e226c32.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 373ed41..f35ea92 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -58,6 +58,8 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 58 | 58 | ||
| 59 | public ISceneAgent SceneAgent { get; set; } | 59 | public ISceneAgent SceneAgent { get; set; } |
| 60 | 60 | ||
| 61 | public int PingTimeMS { get { return 0; } } | ||
| 62 | |||
| 61 | private string m_username; | 63 | private string m_username; |
| 62 | private string m_nick; | 64 | private string m_nick; |
| 63 | 65 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index c88ccc5..7002d75 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -81,6 +81,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 81 | get { return m_scene; } | 81 | get { return m_scene; } |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | public int PingTimeMS { get { return 0; } } | ||
| 85 | |||
| 84 | public UUID OwnerID | 86 | public UUID OwnerID |
| 85 | { | 87 | { |
| 86 | get { return m_ownerID; } | 88 | get { return m_ownerID; } |