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

diff options

author	Melanie	2012-06-08 00:14:39 +0100
committer	Melanie	2012-06-08 00:14:39 +0100
commit	c5af3e384c386dcc46588f97b342212945ada3f5 (patch)
tree	011a47c2644eb4076f49d68a46c3dd9c91c1875b /OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
parent	Merge branch 'avination' into careminster (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC-c5af3e384c386dcc46588f97b342212945ada3f5.zip opensim-SC-c5af3e384c386dcc46588f97b342212945ada3f5.tar.gz opensim-SC-c5af3e384c386dcc46588f97b342212945ada3f5.tar.bz2 opensim-SC-c5af3e384c386dcc46588f97b342212945ada3f5.tar.xz

Merge branch 'master' into careminster

Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs

Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs')

0 files changed, 0 insertions, 0 deletions