Melanie
3f200da878
Merge branch 'master' into careminster-presence-refactor
2011-01-28 02:36:20 +00:00
Melanie
7492131bb6
Fix bumping into sim borders and check estate bans for walking crossings
2011-01-28 01:37:37 +01:00
Justin Clark-Casey (justincc)
f9ea5e69c5
Refactor: Break out LoadObjects() and LoadParcels() from a longer method
2011-01-27 21:07:21 +00:00
Justin Clark-Casey (justincc)
19e4473a97
Put confirmation on "land clear" command to avoid nasty accidents
2011-01-27 20:57:59 +00:00
Melanie
3435816541
Merge branch 'master' into careminster-presence-refactor
2011-01-27 20:54:02 +00:00
Justin Clark-Casey (justincc)
be3685b1a2
When an oar is loaded, do not create a default parcel before loading the parcels from the OAR.
...
The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.
Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
2011-01-27 20:36:50 +00:00
Justin Clark-Casey (justincc)
42c0dbf49a
Show local IDs in "land show" output.
...
Also properly insert region name in "land clear" command
2011-01-27 20:11:30 +00:00
Justin Clark-Casey (justincc)
ab9a0f2f1d
Add "land clear" command
...
This clears all parcels from the currently selected region and replaces them with the single region spanning default parcel owned by the estate owner
2011-01-27 19:37:20 +00:00
Justin Clark-Casey (justincc)
5a26dc2743
Fix OAR parcel loading so that old parcels are replaced by the new instead of merged.
...
The --merge switch will still merge the old and new land parcelling.
2011-01-27 18:48:48 +00:00
Justin Clark-Casey (justincc)
e33cb3db93
remove unused CreateBaseLand()
2011-01-27 16:50:41 +00:00
BlueWall
d89d9d1b13
Merge branch 'master' of /home/opensim/src/OpenSim/Core
2011-01-27 08:53:57 -05:00
Melanie
b0f641fa15
Make it work
2011-01-27 06:41:07 +00:00
Melanie
b13eac9996
Make the estate setting "Allow direct teleport" override the constraint
...
of local tepeports to landing points like it is meant to
2011-01-27 07:07:33 +01:00
Melanie
2a9e712cb4
Let gods TP in wherever they like while in god mode
2011-01-27 07:03:43 +01:00
Melanie
8568c6a7c0
Implement "Cannot teleport closer to destination" message
2011-01-27 06:57:54 +01:00
Melanie
1143e022b4
Make landing points work on local teleports. Constrain owners and gods to
...
landing points when coming from off sim (matches agni) to prevent landing
in floors or other prims.
2011-01-27 06:45:53 +01:00
Melanie
17801bd78b
Add a TeleportFlags member to SP so we can tell how we got there.
2011-01-27 05:33:46 +00:00
Melanie
adb341e32f
Also set Godlike flag. Might be useful
2011-01-27 05:33:01 +00:00
Melanie
61b67b2ead
Add TeleportFlags.ViaRegionID to the flags sent on login when the region
...
was entered by hand to determine whether or not to honor the landing
point
2011-01-27 05:32:54 +00:00
Melanie
eca82d90c2
Change the way landing points are honored
2011-01-27 06:04:56 +01:00
Melanie
d894007920
Make it work
2011-01-27 05:46:31 +01:00
Melanie
0e76f2f64e
Merge branch 'master' into careminster-presence-refactor
2011-01-27 05:38:12 +00:00
Melanie
4cc8d84281
Fix build break
2011-01-27 05:30:39 +00:00
Melanie
42c22f41dd
Merge branch 'master' into careminster-presence-refactor
2011-01-27 05:18:28 +00:00
Melanie
c43b892f3a
Add a TeleportFlags member to SP so we can tell how we got there.
2011-01-27 04:14:41 +01:00
Melanie
1f19bd5f90
Also set Godlike flag. Might be useful
2011-01-27 03:54:41 +01:00
Melanie
3b8b606eeb
Add TeleportFlags.ViaRegionID to the flags sent on login when the region
...
was entered by hand to determine whether or not to honor the landing
point
2011-01-27 03:49:32 +01:00
Melanie
0e1d28a862
Clear user account cache before checking flags on login. This will make AV
...
and other bannable flags work in this case.
2011-01-27 03:05:33 +01:00
Melanie
dd1980c24c
Add an interface for a region's user account cache
2011-01-27 02:58:14 +01:00
Melanie
307a2c61ef
Fix merge artifacts
2011-01-27 02:43:52 +01:00
Melanie
3321f9d745
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-27 02:29:10 +01:00
Melanie
11c742a5a8
Make bans work for teleport. Now teleport will complete block if the user
...
is not allowed on the estate. If the user is allowed on no parcel, the
teleport will also be blocked. If the user is allowed on a parcel, but
not the desired one, the user will be shifted to the closest allowed
location.
2011-01-27 02:16:41 +01:00
Tom
31fb448cfc
Mostly revert the last commit with the aim of searching for a better solution
2011-01-26 17:06:17 -08:00
Tom
6b27587bc7
Add a "useCached" parameter to GetUserAccount. Add a function to Scene to get the user flags. It has to be here due to access restrictions :/
2011-01-26 16:25:08 -08:00
Tom
3ecf712e4d
Add userFlags check to isBanned. This checks bans against DenyAnonymous and DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on .
2011-01-26 14:20:39 -08:00
Mic Bowman
2bab8e5538
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-26 13:35:21 -08:00
Mic Bowman
240c0eaf1d
Remove the RestorePresences functions (which don't seem to be doing
...
anything) and clean up the code in AddNewClient (so Appearance only
gets assigned once, not three times).
2011-01-26 13:33:34 -08:00
Justin Clark-Casey (justincc)
8eb2789ae1
Add some comments on ILandObject.StartPoint and EndPoint
2011-01-26 21:19:22 +00:00
Justin Clark-Casey (justincc)
a0469daf75
Implement command "land show". This shows all the parcels on the currently selected region/s
...
This is useful for diagnostics. The command is "land show" rather than "show land" because it's implemented as a module specific subcommand.
2011-01-26 21:12:41 +00:00
Tom
04c62c4959
Revert my previous SHA1 commit in favour of a better implementation
2011-01-26 12:54:12 -08:00
Tom
63dcd44e87
Provide an SL compatible llMD5String function across all platforms
2011-01-26 12:47:43 -08:00
Tom
4d3696d658
Make llSHA1Hash SL compatible when using characters like the euro symbol (€)
2011-01-26 12:40:33 -08:00
Mic Bowman
c4727645b8
Removed a few more spurious appearance saves. When an avatar
...
enters a region the attachments module tries to update the
appearance with attachments that are already part of the appearance.
Just added a check to only save if the attachments weren't there
before.
2011-01-25 14:23:58 -08:00
Melanie
3c075aaf46
Reproduce a corner case behavior for llListReplaceList
2011-01-25 16:19:29 +01:00
Melanie
b91c99b596
Fix script data not being reset as it should be
2011-01-24 03:07:01 +00:00
Melanie
aa6c097cca
Complete country support
2011-01-24 03:08:00 +01:00
Melanie
3d098bf27d
Merge branch 'master' into careminster-presence-refactor
2011-01-24 03:08:47 +00:00
Melanie
649d9ef934
Fix script data not being reset as it should be
2011-01-24 02:20:54 +01:00
Melanie
dbbf43663e
Add a careminster API to scripting again
2011-01-24 02:16:28 +01:00
Melanie
105deab601
Merge branch 'master' into careminster-presence-refactor
2011-01-23 23:29:25 +00:00