diff options
| author | Melanie | 2012-08-23 01:41:47 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-23 01:41:47 +0100 |
| commit | f8603a215d142f3b83a5ff1dc022b716b3e48f99 (patch) | |
| tree | 49971f8e12efcfea18b4b2fdb6bd54c904d3f52c /OpenSim/Framework/RegionLoader/Filesystem | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | this should be an if-else block in case the non-phys min/max are smaller than... (diff) | |
| download | opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.zip opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.gz opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.bz2 opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework/RegionLoader/Filesystem')
0 files changed, 0 insertions, 0 deletions