Commit Graph

15122 Commits (ee1e725e394fbc15a6539f309ecebf21b70f73b0)

Author SHA1 Message Date
BlueWall 672ee2a888 Prebuild fix
Make prebuild fix for monodevelop. Needed path to reference
	legacy Mono.Data.SQLite in ./bin/Mono.Data.SQLite.dll.
2010-11-12 01:17:33 +00:00
BlueWall 00b0f521fa Add PARCEL_DETAILS_ID to LSL 2010-11-12 01:16:14 +00:00
Kitto Flora b2aeea66e3 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-11-11 04:51:05 +00:00
Kitto Flora 9462a1861b Fix excessive forward motion and flailing while descending a slope, prevent adding motion while falling from flying. 2010-11-11 04:49:47 +00:00
opensim mirror account b02ca416e5 Merge branch 'master' of /var/git/opensim/ 2010-11-10 09:20:09 -08:00
Melanie bfc128529c Prevent teleporting to a region when the egent is banned in all parcels 2010-11-10 16:20:19 +00:00
Melanie aace455249 Prevent teleporting to a region when the egent is banned in all parcels 2010-11-10 16:22:55 +01:00
opensim mirror account a92d0faf50 Merge branch 'master' of /var/git/opensim/ 2010-11-09 18:20:05 -08:00
Melanie ff3e466000 Remove a debug spam 2010-11-10 01:17:40 +00:00
opensim mirror account d93aff0276 Merge branch 'master' of /var/git/opensim/ 2010-11-09 16:50:03 -08:00
Melanie 846198bb9e Although the Allow Voice setting is per estate rather than per region,
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:55:43 +00:00
Melanie b68f701c00 Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-11-09 23:55:19 +00:00
Melanie fa64f2e56e Although the Allow Voice setting is per estate rather than per region,
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:54:08 +00:00
opensim mirror account a969036562 Merge branch 'master' of /var/git/opensim/ 2010-11-09 15:10:08 -08:00
Melanie ee85a530f6 Merge branch 'master' into careminster-presence-refactor 2010-11-09 22:16:48 +00:00
Melanie 22144eb8f7 Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed. 2010-11-09 22:15:59 +00:00
Melanie d206721e2f Add option SeeIntoBannedRegion to allow band to act like SL, where you can
see in but not enter. Defaults to false, so no change.
2010-11-09 22:41:40 +01:00
Melanie dfe11566f4 Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed. 2010-11-09 20:18:36 +01:00
Melanie ccfbce3176 Remove "OpenSimulator" from startup message 2010-11-09 16:07:43 +01:00
Melanie 09ea73f7cc Change "OpenSim" to "Careminster" and remove CM suffix. 2010-11-09 15:33:03 +01:00
Melanie 15da52d73a Prevent temp-on-rez prims from being persisted 2010-11-08 19:00:03 +01:00
opensim mirror account 4a20a544d6 Merge branch 'master' of /var/git/opensim/ 2010-11-08 04:50:04 -08:00
Jeff Ames ae9c4a4d11 Formatting cleanup. 2010-11-08 07:48:35 -05:00
opensim mirror account 2e4c0c66ff Merge branch 'master' of /var/git/opensim/ 2010-11-07 20:00:06 -08:00
opensim mirror account 4ff3be90e0 Merge branch 'master' of /var/git/opensim/ 2010-11-07 19:50:07 -08:00
Melanie df0787f5cf Merge branch 'master' into careminster-presence-refactor 2010-11-08 03:08:02 +00:00
Melanie 798abd1508 Reinstate a lost fix 2010-11-08 03:06:58 +00:00
Melanie 8a97d58f09 Merge branch 'master' into careminster-presence-refactor 2010-11-08 03:05:07 +00:00
Melanie 6056ae8d88 Fix merge artefacts 2010-11-08 02:58:33 +00:00
Melanie 18b27408d6 Prevent plants from being treated like dropped attachments and removed
from the sim.
2010-11-08 02:39:06 +00:00
Melanie 4f6dd8bda3 Call the cleanup after saving attachment states, so that the attachments
don't get killed before they can be saved
2010-11-08 02:38:15 +00:00
Melanie 2f58d56137 Call the Cleanup when an agent logs out, when an agent leaves and just
before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport
2010-11-08 02:37:28 +00:00
Melanie Thielker d8fffd0fb5 Call attachment cleanup when an agent crosses out 2010-11-08 02:37:00 +00:00
Melanie Thielker 2317b6767b Add a method to delete left over / dropped attachments 2010-11-08 02:36:51 +00:00
Melanie 6585243113 Detach attachments displaced by other attachments 2010-11-08 02:35:47 +00:00
Melanie 5a3cd9f1d0 Decrease min search length to 2 chars for map search. 2010-11-07 16:08:41 +01:00
Jonathan Freedman 4f40374464 Merge git://github.com/opensim/opensim into mantis5110 2010-11-05 19:10:02 -07:00
opensim mirror account 3711f956a6 Merge branch 'master' of /var/git/opensim/ 2010-11-05 07:40:06 -07:00
opensim mirror account e89dcdada9 Merge branch 'master' of /var/git/opensim/ 2010-11-05 07:30:10 -07:00
Melanie 4db60a5a40 Fix the inventory transfer module to not cause duplicated text IMs 2010-11-05 15:24:08 +01:00
Melanie 7844872067 Fix merge artefacts 2010-11-05 14:46:13 +01:00
Melanie 644eb9fd7f Fix playing sound from HUDs 2010-11-05 13:45:28 +00:00
Melanie e078c57bf0 Fix attached sounds from HUDs erroneously being delivered to other avatars 2010-11-05 13:39:04 +00:00
Melanie 1c8d19d714 Delete existing presences for a user ID when they log in again.
WARNING!!! This changes a default. The old default is to allow multiple
presences, the new default disables this. As the feature currently has no users,
this should not present any difficulty and will alleviate the presence
issues somewhat.
2010-11-05 13:31:45 +00:00
Melanie ddd3c6824a Revert "Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)"
This reverts commit 40e05f4109.

Conflicts:

	OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
2010-11-05 14:27:53 +01:00
Melanie f985775962 Revert "Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready."
This reverts commit 91b1d17e5b.

Conflicts:

	OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-11-05 14:27:14 +01:00
Melanie 654814d563 Merge branch 'master' into careminster-presence-refactor 2010-11-05 13:45:50 +00:00
Melanie 6bac92db80 Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-11-05 13:34:54 +00:00
Melanie 53d64f755a Merge branch 'master' into careminster-presence-refactor 2010-11-05 13:33:58 +00:00
Melanie 893915ce0b Fix child prims returning after being unlinked and deleted where the root is
not deleted
2010-11-04 21:09:59 +01:00