ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,687 Commits 5 Branches 88 Tags
b2aeea66e36593ccab973240bab43724f577165b
Commit Graph

9384 Commits

Author SHA1 Message Date
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
Melanie
aace455249 Prevent teleporting to a region when the egent is banned in all parcels 2010-11-10 16:22:55 +01: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
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
15da52d73a Prevent temp-on-rez prims from being persisted 2010-11-08 19:00:03 +01:00
Jeff Ames
ae9c4a4d11 Formatting cleanup. 2010-11-08 07:48:35 -05: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
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
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
893915ce0b Fix child prims returning after being unlinked and deleted where the root is 
not deleted
 2010-11-04 21:09:59 +01:00
Melanie
82e534a029 Fix avatar to avatar inventory gives across servers 2010-11-04 19:07:43 +01:00
Melanie
b8924167e0 Fix creation of a duplicate physics actor on chained drag-copy operations, 
the main cause for "ghost prims"
 2010-11-04 10:37:39 +01:00
Melanie
c2bd6ccdb8 Fix playing sound from HUDs 2010-11-03 23:20:30 +01:00
Melanie
5f8ab9f018 Merge branch 'master' into careminster-presence-refactor 2010-11-03 02:34:36 +00:00
Melanie
6c3b7617b0 Add lsClearWindlightScene() to the lightshare module to remove WL settings 
from a region and allow normal day cycles to be reestablished
 2010-11-03 02:31:43 +00:00
Melanie
4ab9d37a8e When LightShare is enabled, the standard day cycle is bypassed and replaced by 
midday defaults when no specific LightShare profile is set.
This prevents LightShare info being send out when the region has no LightShare
profile, allowing normal day/night cycles to happen.
 2010-11-03 02:04:17 +00:00
Melanie
e9ec187746 Merge branch 'master' into careminster-presence-refactor 2010-11-03 00:48:18 +00:00
Melanie
57eabe9d46 Actually calculate the height before setting it, this isn't done automatically 
on incoming transfers in all cases.
 2010-11-03 00:47:22 +00:00
Melanie
7d551e27ca Trying to prevent a wrong physical actor size 2010-11-03 00:01:47 +00:00
Melanie
797e461ef9 Merge branch 'master' into careminster-presence-refactor 2010-11-02 23:41:13 +00:00
Melanie
d555c373d8 Fix avatar height management 2010-11-02 23:39:45 +00:00
Melanie
26f12f479f Merge branch 'master' into careminster-presence-refactor 2010-11-02 22:58:33 +00:00
Melanie
78a0ed3ff9 Fix sitting and standing up 2010-11-02 21:28:24 +00:00
Diva Canto
9f5ab3b965 Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical. 2010-11-02 12:05:24 -07:00
dahlia
ed7959ddfb Thanks Snoopy for a patch that addresses Mantis #0005165: osSetDynamicTextureURL crashed region server 
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
 2010-11-02 02:35:56 -07:00
Diva Canto
f15f0ab59b Removed a couple of very verbose debug messages. 2010-10-31 12:11:30 -07:00
Melanie
623cee1ffc Move physics actor creation to after SetHeight to try and prevent 
bowlegginess. Didn't work but is better this way anyway.
 2010-10-30 19:17:52 +01:00
Melanie
e98d8d500f Fix logins and avatar appearance. Contains a Migration. May contain nuts. 
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
 2010-10-30 19:06:47 +01:00
Teravus Ovares (Dan Olivares)
09bf9d5fca * AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer. 2010-10-30 02:26:48 -04:00
Justin Clark-Casey (justincc)
f9227977f8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-10-30 03:07:45 +01:00
Justin Clark-Casey (justincc)
45220a6954 minor: remove some old commented out code 2010-10-30 03:01:40 +01:00