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
13,522 Commits 5 Branches 88 Tags
0d4086e6025d2d6ccbf1339a22a443eb746e834f
Commit Graph

1416 Commits

Author SHA1 Message Date
Tom
a636af13e7 Make sure the avatar position gets moved along with a prim it is sitting on. This fixes mantis #208 and (maybe) issues with chat and sound coming from the wrong place when sat on a vehicle. 2010-08-06 06:37:40 -07:00
Tom
0a004f8c44 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-08-06 02:43:26 -07:00
Tom
c5c6627adb Implement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants which had the wrong values (checked using LSL in SL). This addresses mantis #217 and mantis #53. 2010-08-06 02:40:31 -07:00
Melanie Thielker
8bdbcda2b7 We already have a record of killed prims. It just wasn't used by the new 
JHurlicane code anymore. Use it to prevent sending updates after kills.
 2010-08-05 18:50:17 +02:00
Tom
f1c51c8bb4 Scripted sit target fixes 2010-08-03 19:51:32 -07:00
Tom
ae99c1393d Fix scripted sit offset in child prims 2010-08-03 15:31:04 -07:00
Melanie Thielker
e3184753a6 Log the UUID of a prim that fails meshing and set the prim to phantom during 
region startup
 2010-08-03 05:25:23 +02:00
Melanie
3302e8ddc4 Merge branch 'master' into careminster-presence-refactor 2010-07-31 00:57:50 +01:00
Diva Canto
f3fa10fa15 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-07-30 14:04:29 -07:00
Diva Canto
8ab7d80b09 Changed the way HG client verification is done: now transforming local and LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network. 2010-07-30 14:04:13 -07:00
Justin Clark-Casey (justincc)
f84dbafb0c remove gods event subscription to gods module from scene 2010-07-30 21:58:24 +01:00
Justin Clark-Casey (justincc)
63f3a16b72 remove empty, unused and uncalled UnsubscribeToClientEvents() 2010-07-30 21:44:50 +01:00
Justin Clark-Casey (justincc)
424b4b2b86 move attachment subscription events into AttachmentsModule from scene. 
restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
 2010-07-30 21:41:44 +01:00
Justin Clark-Casey (justincc)
4d83b2d8a6 remove unused BasicQuadTreeNode 2010-07-30 21:06:45 +01:00
Melanie Thielker
696b6c727f Allow gods and estate managers/owners to be unaffected by parcel bans 2010-07-29 16:20:40 +01:00
Melanie Thielker
7871dd606e Allow gods and estate managers/owners to be unaffected by parcel bans 2010-07-29 16:33:20 +02:00
Melanie Thielker
516ec4acd0 Eat a lockign exception that kills scripts. May bear more investigation 
in the long run.
 2010-07-25 08:11:39 +02:00
Melanie Thielker
fb89d0ff4e Allow megaregions to be used in M7, should we so decide 2010-07-21 12:32:23 +02:00
Melanie Thielker
d4022becc3 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-21 12:16:30 +02:00
Melanie
f63a4c8f2f Merge branch 'master' into careminster-presence-refactor 2010-07-21 12:03:44 +01:00
Melanie Thielker
c72c84b455 Refine autoreturn a bit 2010-07-21 12:16:17 +02:00
Melanie
ac1a34714d Allow Megaregions to start properly after an unclean shutdown 2010-07-20 23:24:04 +01:00
Diva Canto
f08afc4f87 Restore lines that have been removed due to previous merge conflict. 2010-07-20 14:28:17 -07:00
Melanie
4ccc141764 Resync with master 2010-07-20 21:49:31 +01:00
Melanie
c0b8cbd85b Merge branch 'master' into careminster-presence-refactor 2010-07-20 21:47:53 +01:00
Melanie
dcf7973c9b Merge branch 'master' into careminster-presence-refactor 2010-07-20 21:39:20 +01:00
Melanie
176cb01130 Remove a merge artefact 2010-07-20 21:38:31 +01:00
Melanie
686837d9ed Merge branch 'master' into careminster-presence-refactor 2010-07-20 21:18:27 +01:00
Melanie Thielker
120d7014fd When a god uses mass permission setting, the V bit is cleared from next 
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
 2010-07-20 21:01:46 +01:00
Melanie Thielker
ea51bea508 prevent hacked viewers from being able to delete arbitrary items from any 
prim. Allow friends with perms and shared group members to move or copy
things out of prims
 2010-07-20 21:01:14 +01:00
Melanie Thielker
78605baab3 Fix a few permissions vulnerability. Owners could cause permissions 
escalation on items contained in prims using a hacked viewer
 2010-07-20 21:00:56 +01:00
Diva Canto
7c124a5543 Relaxed the ultra-conservative lock on m_items. Needs testing under linux and stress. 2010-07-20 05:59:18 -07:00
Melanie Thielker
fd66ee57f3 When a god uses mass permission setting, the V bit is cleared from next 
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
 2010-07-20 14:45:46 +02:00
Diva Canto
cd2bb7daf3 Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests indicate that this is what causes deadlock. More tests needed. 2010-07-19 08:07:37 -07:00
Melanie
a974704a3e re-add the sleep lost in the revert. 2010-07-19 14:37:27 +01:00
Melanie
575f7d3366 Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage" 
This reverts commit c404c5fb54.
 2010-07-19 14:36:53 +01:00
Tom Grimshaw
c088397ec7 If the client requests that an object be deleted, and the SOG/SOP is null and/or is marked as deleted, just send the KillObject 2010-07-18 06:01:26 -07:00
Melanie Thielker
3f91805afb prevent hacked viewers from being able to delete arbitrary items from any 
prim. Allow friends with perms and shared group members to move or copy
things out of prims
 2010-07-15 20:28:18 +02:00
Melanie Thielker
8d2b4b7b48 Fix a few permissions vulnerability. Owners could cause permissions 
escalation on items contained in prims using a hacked viewer
 2010-07-15 20:03:08 +02:00
Melanie Thielker
ddfff55cc7 Preserve attachment data while a prim is in world. Allows attachment 
editing on the ground without losing attachpoint and position
 2010-07-14 21:06:49 +02:00
Melanie
e1ea82b329 Major attachments cleanup. Remove unused AttachObject ClientView method 
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
 2010-07-14 19:51:12 +01:00
Melanie Thielker
a7b5fe6a88 Remove useless quaternion parameter from AttachObject sig 2010-07-14 19:49:54 +01:00
Melanie
0b74662ce2 Merge branch 'master' into careminster-presence-refactor 2010-07-14 19:53:15 +01:00
Diva Canto
12858122d5 Fixes mantis #4870. 2010-07-14 11:02:41 -07:00
Melanie Thielker
bebbe407ee Major attachments cleanup. Remove unused AttachObject ClientView method 
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
 2010-07-14 19:58:23 +02:00
Melanie Thielker
0c445239a6 Remove useless quaternion parameter from AttachObject sig 2010-07-14 19:21:01 +02:00
Melanie Thielker
39cd57598b Fix a permissions issue 2010-07-14 16:12:44 +01:00
Melanie Thielker
cbb3a8ab94 Fix a permissions issue 2010-07-14 16:21:55 +02:00
Melanie
33aa7ba7dc Revert "More on mantis #4869. This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing." 
Cuauses a permission escalation. do NOT USE the preceding commit
 2010-07-14 14:59:34 +01:00
Diva Canto
bec1d7cc36 Removed left-over debug messages. 2010-07-14 07:00:24 -07:00