diff options
author | Melanie | 2013-10-04 20:03:12 +0100 |
---|---|---|
committer | Melanie | 2013-10-04 20:03:12 +0100 |
commit | 75c68fa29e3a2fed81c883e7925bf161e968639f (patch) | |
tree | 13ba69e6818f634018a5954d38750cf48128b7f8 /OpenSim/Region/OptionalModules/Agent | |
parent | Merge branch 'avination-current' into careminster (diff) | |
parent | minor: Disable logging left active on regression test TestSameSimulatorIsolat... (diff) | |
download | opensim-SC-75c68fa29e3a2fed81c883e7925bf161e968639f.zip opensim-SC-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.gz opensim-SC-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.bz2 opensim-SC-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index a96c8b4..373ed41 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -908,7 +908,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
908 | 908 | ||
909 | public void Start() | 909 | public void Start() |
910 | { | 910 | { |
911 | m_scene.AddNewClient(this, PresenceType.User); | 911 | m_scene.AddNewAgent(this, PresenceType.User); |
912 | 912 | ||
913 | // Mimicking LLClientView which gets always set appearance from client. | 913 | // Mimicking LLClientView which gets always set appearance from client. |
914 | AvatarAppearance appearance; | 914 | AvatarAppearance appearance; |