Melanie
188d86998d
Fix up QueryAccess to also check parcels
2011-01-28 04:09:04 +00:00
Melanie
d91ee131b9
Make the new style stuff compatible with the older revision
2011-01-28 04:31:21 +01:00
Melanie
3bce53b6e6
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-28 04:05:49 +01:00
Kitto Flora
eb3a4c2477
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-28 04:36:20 +00:00
Kitto Flora
9abaac4d60
Correct chat source location for Av seated on daughter prim.
2011-01-28 04:35:43 +00:00
Melanie
1b2deb5b77
Merge branch 'master' into careminster-presence-refactor
2011-01-28 04:09:38 +00:00
Melanie
0ea8046545
Change the way ban lines are handled. Remove a lot of useless stuff designed
...
to physically move the avatar and instead just re-set the position. Ban lines
now work fully.
2011-01-28 04:04:30 +01:00
Melanie
d90b0c53ec
Fix bumping into sim borders and check estate bans for walking crossings
2011-01-28 02:38:14 +00:00
Melanie
3834000778
Change the way ban lines work
2011-01-28 03:35:59 +01:00
Melanie
80bf95b7b4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-28 02:34:45 +00:00
Melanie
5a0cb7d37e
Thank you, Goetz, for a patch to fix prim count display in cut regions.
2011-01-28 02:34:07 +00:00
Melanie
657c14c5db
Fix up QueryAccess to also check parcels
2011-01-28 03:07:25 +01:00
Melanie
566eff17de
Comment a very spammy debug message that was being output directly to console.
...
My last fox that makes bumping into sim borders/bans work makes this spam
endlessly.
2011-01-28 01:46:30 +01:00
Melanie
878d458d9f
Merge branch 'master' into careminster-presence-refactor
2011-01-28 02:39:15 +00:00
Melanie
57bf5d9b2a
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-28 02:37:59 +00:00
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