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

diff options

author	Diva Canto	2012-03-20 17:19:14 -0700
committer	Diva Canto	2012-03-20 17:19:14 -0700
commit	3fa51f66ec2f032134f333bf1fa047275a77f6e0 (patch)
tree	952df67fcc209ecc81ce66b92f4bdf93a7017e08 /bin/assets/TexturesAssetSet/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c
parent	HG Friends: allow the establishment of HG friendships without requiring co-pr... (diff)
parent	Add ability to log warn if a frame takes longer than twice the expected time.... (diff)
download	opensim-SC-3fa51f66ec2f032134f333bf1fa047275a77f6e0.zip opensim-SC-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.gz opensim-SC-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.bz2 opensim-SC-3fa51f66ec2f032134f333bf1fa047275a77f6e0.tar.xz

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Conflicts: OpenSim/Framework/Util.cs

Diffstat (limited to 'bin/assets/TexturesAssetSet/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c')

0 files changed, 0 insertions, 0 deletions