diff options
| author | Diva Canto | 2012-03-20 17:19:14 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-20 17:19:14 -0700 |
| commit | 3fa51f66ec2f032134f333bf1fa047275a77f6e0 (patch) | |
| tree | 952df67fcc209ecc81ce66b92f4bdf93a7017e08 /OpenSim/Region/ClientStack | |
| parent | HG Friends: allow the establishment of HG friendships without requiring co-pr... (diff) | |
| parent | Add ability to log warn if a frame takes longer than twice the expected time.... (diff) | |
| download | opensim-SC-3fa51f66ec2f032134f333bf1fa047275a77f6e0.zip opensim-SC-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.gz opensim-SC-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.bz2 opensim-SC-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Framework/Util.cs
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 35cb575..ed3430a 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -761,7 +761,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 761 | SceneObjectPart part = m_Scene.GetSceneObjectPart(objectID); | 761 | SceneObjectPart part = m_Scene.GetSceneObjectPart(objectID); |
| 762 | if (part != null) | 762 | if (part != null) |
| 763 | { | 763 | { |
| 764 | TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID); | 764 | // TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(notecardID); |
| 765 | if (!m_Scene.Permissions.CanCopyObjectInventory(notecardID, objectID, m_HostCapsObj.AgentID)) | 765 | if (!m_Scene.Permissions.CanCopyObjectInventory(notecardID, objectID, m_HostCapsObj.AgentID)) |
| 766 | { | 766 | { |
| 767 | return LLSDHelpers.SerialiseLLSDReply(response); | 767 | return LLSDHelpers.SerialiseLLSDReply(response); |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs index fb94355..d76927b 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | |||
| @@ -50,7 +50,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
| 50 | m_regStatus = RegionStatus.Up; | 50 | m_regStatus = RegionStatus.Up; |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | public override void Update() {} | 53 | public override void Update(int frames) {} |
| 54 | public override void LoadWorldMap() {} | 54 | public override void LoadWorldMap() {} |
| 55 | 55 | ||
| 56 | public override ISceneAgent AddNewClient(IClientAPI client, PresenceType type) | 56 | public override ISceneAgent AddNewClient(IClientAPI client, PresenceType type) |