diff options
| author | Melanie | 2011-11-01 23:54:09 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-01 23:54:09 +0000 |
| commit | b69f679122fb7fdc0f77fc198e148f42797a2eef (patch) | |
| tree | e06d4f4572a91a58c79c03c60b0fca5574467834 /bin | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Removed see_into_this_sim_from_neighbor configuration option. (diff) | |
| download | opensim-SC-b69f679122fb7fdc0f77fc198e148f42797a2eef.zip opensim-SC-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.gz opensim-SC-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.bz2 opensim-SC-b69f679122fb7fdc0f77fc198e148f42797a2eef.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 | ||||
| -rwxr-xr-x | bin/PumaCode.SvnDotNet.dll | bin | 183808 -> 0 bytes |
2 files changed, 0 insertions, 3 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 3540a6e..e9d8717 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -170,9 +170,6 @@ | |||
| 170 | ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago | 170 | ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago |
| 171 | MaximumTimeBeforePersistenceConsidered = 600 | 171 | MaximumTimeBeforePersistenceConsidered = 600 |
| 172 | 172 | ||
| 173 | ; Should avatars in neighbor sims see objects in this sim? | ||
| 174 | see_into_this_sim_from_neighbor = true | ||
| 175 | |||
| 176 | ; ## | 173 | ; ## |
| 177 | ; ## PHYSICS | 174 | ; ## PHYSICS |
| 178 | ; ## | 175 | ; ## |
diff --git a/bin/PumaCode.SvnDotNet.dll b/bin/PumaCode.SvnDotNet.dll deleted file mode 100755 index ff91789..0000000 --- a/bin/PumaCode.SvnDotNet.dll +++ /dev/null | |||
| Binary files differ | |||