opensim/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs at 0bc8238a6c25bc42438caee0cf42deec00f26b8e

mirror of https://github.com/opensim/opensim.git synced 2026-07-21 15:17:06 +08:00

Files

Melanie 0bc8238a6c Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Watchdog.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2012-07-11 03:56:50 +01:00

13 KiB

Raw Blame History

View Raw

13 KiB Raw Blame History

13 KiB

Raw Blame History