diff options
| author | Mic Bowman | 2011-08-19 14:49:16 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-19 14:49:16 -0700 |
| commit | 384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f (patch) | |
| tree | 5e557eac5d4d3d4ad95b9e3e70a2a661e5745ec3 /OpenSim/Framework/NetworkServersInfo.cs | |
| parent | BulletSim: add runtime setting of physics parameters. Update default values. (diff) | |
| parent | Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.... (diff) | |
| download | opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.zip opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.gz opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.bz2 opensim-SC-384cb79a1a27c47bb3fdbdef6d601a3dcb9dfb0f.tar.xz | |
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Framework/NetworkServersInfo.cs')
0 files changed, 0 insertions, 0 deletions