ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-02 23:18:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,845 Commits 5 Branches 88 Tags
c02e0e930d078ab5e2d4070df65c3d74f5812cbc
Commit Graph

259 Commits

Author SHA1 Message Date
Melanie
474910c9d6 Merge branch 'master' into careminster-presence-refactor 2011-04-17 18:48:53 +01:00
Diva Canto
cd6dce1108 Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more testing to make sure HG inventory isn't broken by this (it shouldn't). 2011-04-15 16:42:40 -07:00
Justin Clark-Casey (justincc)
1dba671f45 refactor: separate out code that adds permissions 2011-04-15 23:32:46 +01:00
Justin Clark-Casey (justincc)
9c7f14bf36 minor: remove a small amount of code duplication 2011-04-15 23:07:23 +01:00
Justin Clark-Casey (justincc)
52d9230392 refactor: split out some rez code into a separate CreateItemForObject() method 2011-04-15 22:47:47 +01:00
Justin Clark-Casey (justincc)
66a62678e5 get rid of all traces of the now used mock service infrastructure 2011-04-15 01:37:27 +01:00
Justin Clark-Casey (justincc)
e439264824 simplify TestRezObject() 2011-04-14 20:23:48 +01:00
Justin Clark-Casey (justincc)
c644ab6a2c Make scene object parts created by the test utils unit sized. 2011-04-14 20:21:44 +01:00
Justin Clark-Casey (justincc)
aaf9125869 simplify coalesced object tests by using existing scene object set up utils 
this change makes it possible to set an absolute position on a group before it is put into a scene.
 2011-04-14 17:33:55 +01:00
Justin Clark-Casey (justincc)
c5465414b6 Use common coalesced serialization code for both tests and the InventoryAccessModule. 
Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again
 2011-04-13 22:55:26 +01:00
Justin Clark-Casey (justincc)
c81f5bfc5c Adjust the quanterions used in the rez coalsced object tests to get sensible bounding box and offset numbers. 
Extend test to check position of objects in the rezzed coalescence.
 2011-04-13 22:29:12 +01:00
Justin Clark-Casey (justincc)
68cc5b46fe refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer. 2011-04-13 21:48:16 +01:00
Justin Clark-Casey (justincc)
d8d28c3737 Fix bug where rezzing coalesced objects would give all objects the same name as the item. 
This now only happens for the first object (which was the item selected last when the coalesce was originally taken)
This matches the expected behaviour of the environment as seen on the Linden Labs grid.
 2011-04-13 21:31:45 +01:00
Justin Clark-Casey (justincc)
58efd761d1 Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test. 
This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.
 2011-04-13 21:17:43 +01:00
Justin Clark-Casey (justincc)
08fd1d9bbd factor out some test code into the SetUp() 2011-04-13 18:11:04 +01:00
Justin Clark-Casey (justincc)
6613daa82a Add a regression test for rezzing a single object into a scene from user inventory 2011-04-13 17:46:36 +01:00
Justin Clark-Casey (justincc)
b0889ed92a refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersection byte 2011-04-12 22:30:43 +01:00
Justin Clark-Casey (justincc)
98d7de22dc Fix (add) ability to rez objects by dragging them out of another prim's inventory. 
This should happen if the client supplies a task ID with the RezObject call.
The rez goes through the same code as llRezObject(), so the same perms are applied.
Rotation isn't yet preserved, this should be fixed shortly.
 2011-04-12 18:31:41 +01:00
Melanie
adb14ad20a Implement rezzing coalesced objects 2011-04-03 20:32:04 +01:00
Melanie
a4b3439025 Implement rezzing coalesced objects 2011-04-03 20:26:18 +01:00
Melanie
b385d4aa03 Implement taking of coalesced objects. 
WARNING!!!!!
You can TAKE them, but you can't REZ them again. Only the first of the contained
objects will rez, the rest is inaccessible until rezzing them is implemented.
Also, rotations are not explicitly stored. This MAY work. Or not.
 2011-04-03 20:24:44 +01:00
Melanie
3a113f9902 A stab at making CHANGED_OWNER work 2011-04-01 22:04:29 +01:00
Melanie
95e524dde1 A stab at making CHANGED_OWNER work 2011-04-01 18:49:53 +02:00
Melanie
9165a5207d Merge branch 'master' into careminster-presence-refactor 2011-03-10 07:14:03 +00:00
Justin Clark-Casey (justincc)
20aeace8d7 Add log messages on teleport failure to better pin down the cause. 2011-03-09 22:03:12 +00:00
Melanie
cea47491de Fix a few little things 2011-02-27 19:49:23 +00:00
Melanie
11105d38bd Fix a few little things 2011-02-27 18:55:17 +01:00
Melanie
9be1d2aef1 Merge branch 'master' into careminster-presence-refactor 2011-02-24 02:37:21 +00:00
Mic Bowman
1bb0bae78a Forces the owner of a rezzed object to be the "rezzer" of the 
object rather than the owner of the inventory item. In theory,
this shouldn't happen unless you are using grid-wide library
for inventory.
 2011-02-22 13:30:38 -08:00
Mic Bowman
5a16fa882c Parameterizes the view distance used to compute and manage 
child agents in neighbor regions. This means you can extend
the view on a simulator beyond the default 3x3 regions.

This uses a region default draw distance and should be
replaced at some point by the avatar specified draw distance.
That will require more careful, dynamic recomputation of child
agents every time the draw distance changes.

WARNING: this is experimental and has known instabilities. specifically
all regions "within site" should be running the same default draw distance
or agents will not be closed correctly.
 2011-02-22 13:23:54 -08:00
Melanie
918c12c965 Change the QUERYACCESS method to eliminate spurious access denied messages 2011-02-16 08:06:11 +00:00
Melanie
cfce0aa448 Change the QUERYACCESS method to eliminate spurious access denied messages 2011-02-16 05:22:05 +01:00
Melanie
ccd6e5d071 Merge branch 'master' into careminster-presence-refactor 2011-02-16 02:41:49 +00:00
Diva Canto
a8ced66e87 Improved error message on TP failure 2011-02-12 07:28:21 -08:00
Melanie
3889e68c54 Merge branch 'master' into careminster-presence-refactor 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
	OpenSim/Services/GridService/HypergridLinker.cs
 2011-02-07 22:08:53 +00:00
Diva Canto
f5a3eb9fd5 Added a config var to HGInventoryAccessModule called OutboundPermission that controls whether the sim lets asset POSTs happen to foreign grids or not. It's True by default. If ppl want to allow foreign visitors but don't want to allow any assets out of their grid, they should set this to False. This is the beginning of policies for these things... 2011-02-04 17:05:45 -08:00
Justin Clark-Casey (justincc)
1613d89383 minor: Correct misspelling of neighbour in log messages. 
Thanks Fly-Man-
 2011-02-04 20:51:51 +00:00
Melanie
188d86998d Fix up QueryAccess to also check parcels 2011-01-28 04:09:04 +00:00
Melanie
d90b0c53ec Fix bumping into sim borders and check estate bans for walking crossings 2011-01-28 02:38:14 +00:00
Melanie
657c14c5db Fix up QueryAccess to also check parcels 2011-01-28 03:07:25 +01:00
Melanie
7492131bb6 Fix bumping into sim borders and check estate bans for walking crossings 2011-01-28 01:37:37 +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
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
Melanie
705f4e1e4b Dont' trust the viewer! Fix a permission slam error caused by trusting 
the viewer too much.
 2011-01-12 21:46:49 +00:00
Melanie
914e4b319e Fix direct item give permissions 2011-01-12 21:39:13 +00:00
Melanie
f59b55d930 Dont' trust the viewer! Fix a permission slam error caused by trusting 
the viewer too much.
 2011-01-12 17:40:21 +01:00
Melanie
7f99a8c900 Fix direct item give permissions 2011-01-12 16:20:38 +01:00
Diva Canto
02e661f8dd Minor additional debug message. 2011-01-07 11:39:22 -08:00
Melanie
07cc032081 Allow cross-scope friendships to work, and also allow other cross scope name 
resolution
 2011-01-03 19:42:46 +00:00
Melanie
c48ddbfef1 Fix scoping for prim region crossings 2011-01-03 19:41:02 +00:00