ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 17:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,682 Commits 5 Branches 96 Tags
d206721e2f8833f6c95fa9fda350f0187c24d34f
Commit Graph

1620 Commits

Author SHA1 Message Date
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
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
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
2317b6767b Add a method to delete left over / dropped attachments 2010-11-08 02:36:51 +00: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
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
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
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
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
Justin Clark-Casey (justincc)
09705514ff tweak a few more scene presence logging messages for consistency 2010-10-29 23:52:25 +01:00
Justin Clark-Casey (justincc)
e66ec432af Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic 2010-10-29 23:45:10 +01:00
Justin Clark-Casey (justincc)
abcde41c0d Merge branch 'justincc-dev' 2010-10-29 23:15:35 +01:00
Justin Clark-Casey (justincc)
25e19ba7e9 add timing report to CompleteScenePresence for diagnostic purposes 2010-10-29 23:03:11 +01:00
Melanie
69c1e0b2f7 Merge branch 'master' into careminster-presence-refactor 2010-10-29 21:22:35 +01:00
Melanie
934e536738 Merge commit 'cmickeyb/dev-appearance' 2010-10-29 21:06:46 +01:00
Master ScienceSim
49fa7e91b9 Clean up some cruft from the last commit. Re-add the initial update 
send in the scene presence constructor... need to figure this out
later.
 2010-10-29 13:45:59 -07:00
Master ScienceSim
f5c9a56c8b Bunch of fixes that reduce the number of times appearance 
and avatar data are sent. And the number of times they
are stored.
 2010-10-29 13:43:35 -07:00
Melanie
05d2302c62 Merge branch 'dev-appearance' 2010-10-29 20:24:14 +01:00
Melanie
9331898c32 Merge branch 'master' into careminster-presence-refactor 2010-10-29 20:40:48 +01:00
Master ScienceSim
f2c1d0e34f Merge branch 'opensim-master' into dev-appearance 2010-10-28 09:09:42 -07:00
Melanie
05dbe4f2c4 Merge branch 'master' into careminster-presence-refactor 2010-10-27 20:49:27 +01:00
Melanie
1fcac7203d Prevent nullrefs in scene object deletion. Mantis #5156 2010-10-27 20:47:27 +01:00
dahlia
a4e95c0717 Merge branch 'master' of ssh://MyConnection01/var/git/opensim 2010-10-26 21:20:18 -07:00
dahlia
5968d343bb Overload Scene.NewUserConnection() to facilitate NPCs and other region specific applications 2010-10-26 21:19:33 -07:00
Jeff Ames
a331fd4e24 Formatting cleanup. 2010-10-27 00:01:03 -04:00
Melanie
3113cc9129 Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-10-25 01:24:42 +01:00
Melanie
ac370cf57b Merge branch 'master' into careminster-presence-refactor 2010-10-25 01:24:30 +01:00
Melanie
cf78f3fae3 Comment repeated add and remove of avatars from the physical scene. It's no 
longer needed.
 2010-10-25 00:53:38 +02:00
Melanie
5f266fd571 Change the results from llGetPrimitiveParams to be the same as SL for 
the prim position. This will make attached resizer scripts work like SL.
Existing resizers may be affected adversely.
 2010-10-24 17:18:21 +02:00
Diva Canto
627d1a42fe Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object. 2010-10-23 20:39:41 -07:00