opensim-SC - My fork of OpenSim for IG and DG, called SledjChisl.

diff options

author	Melanie	2013-07-13 00:57:03 +0100
committer	Melanie	2013-07-13 00:57:03 +0100
commit	c6d75cda974a69cd9fe3276bac182aa4c6bb1f17 (patch)
tree	9d5abfecd2cce676a25cd94a3ca29daf62f2e608 /OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs
parent	Merge branch 'master' into careminster (diff)
parent	Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() in... (diff)
download	opensim-SC-c6d75cda974a69cd9fe3276bac182aa4c6bb1f17.zip opensim-SC-c6d75cda974a69cd9fe3276bac182aa4c6bb1f17.tar.gz opensim-SC-c6d75cda974a69cd9fe3276bac182aa4c6bb1f17.tar.bz2 opensim-SC-c6d75cda974a69cd9fe3276bac182aa4c6bb1f17.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs

Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/HGStatusNotifier.cs')

0 files changed, 0 insertions, 0 deletions