diff options
| author | Melanie | 2013-07-13 00:47:58 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-13 00:47:58 +0100 |
| commit | a53a10ad270ea02e57aca7787d0b8278989eea68 (patch) | |
| tree | 7ff1b6d170e828e8b9628ef13078b2cd0ecbd8b6 /OpenSim/Addons/Groups/GroupsModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Centralize duplicated code in SceneObjectPart for subscribing to (diff) | |
| download | opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.zip opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.gz opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.bz2 opensim-SC-a53a10ad270ea02e57aca7787d0b8278989eea68.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Addons/Groups/GroupsModule.cs')
| -rw-r--r-- | OpenSim/Addons/Groups/GroupsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Addons/Groups/GroupsModule.cs b/OpenSim/Addons/Groups/GroupsModule.cs index 5959bac..82e2d6f 100644 --- a/OpenSim/Addons/Groups/GroupsModule.cs +++ b/OpenSim/Addons/Groups/GroupsModule.cs | |||
| @@ -485,7 +485,7 @@ namespace OpenSim.Groups | |||
| 485 | return; | 485 | return; |
| 486 | 486 | ||
| 487 | //// 16 bytes are the UUID. Maybe. | 487 | //// 16 bytes are the UUID. Maybe. |
| 488 | UUID folderID = new UUID(im.binaryBucket, 0); | 488 | // UUID folderID = new UUID(im.binaryBucket, 0); |
| 489 | UUID noticeID = new UUID(im.imSessionID); | 489 | UUID noticeID = new UUID(im.imSessionID); |
| 490 | 490 | ||
| 491 | GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteClient.AgentId.ToString(), noticeID); | 491 | GroupNoticeInfo notice = m_groupData.GetGroupNotice(remoteClient.AgentId.ToString(), noticeID); |