opensim-SC_OLD - My fork of OpenSim for IG and MG, called SledjChisl.

diff options

author	Melanie	2012-01-05 08:15:33 +0000
committer	Melanie	2012-01-05 08:15:33 +0000
commit	1ebc9d04aa33e18e22ee2f03465bc5950c3544ce (patch)
tree	3e7e39255ad455b59434979d47db7da243ac3dd6 /OpenSim/Services/HypergridService/UserAccountCache.cs
parent	Merge branch 'master' into careminster (diff)
parent	Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
download	opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.zip opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.gz opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.bz2 opensim-SC_OLD-1ebc9d04aa33e18e22ee2f03465bc5950c3544ce.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

Diffstat (limited to 'OpenSim/Services/HypergridService/UserAccountCache.cs')

0 files changed, 0 insertions, 0 deletions