aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
diff options
context:
space:
mode:
authorMelanie2013-07-13 00:47:58 +0100
committerMelanie2013-07-13 00:47:58 +0100
commita53a10ad270ea02e57aca7787d0b8278989eea68 (patch)
tree7ff1b6d170e828e8b9628ef13078b2cd0ecbd8b6 /OpenSim/Region/Physics/POSPlugin/POSPrim.cs
parentMerge branch 'master' into careminster (diff)
parentCentralize duplicated code in SceneObjectPart for subscribing to (diff)
downloadopensim-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/Region/Physics/POSPlugin/POSPrim.cs')
0 files changed, 0 insertions, 0 deletions