ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-21 04:55:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,144 Commits 5 Branches 106 Tags
c54bc5094deedecbde2ca2283efefe6df70cc591
Commit Graph

314 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
6b963e73d9 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-19 21:28:30 +01:00
Justin Clark-Casey (justincc)
da83ee28be If a transfer request is received for a task inventory item asset, then route the permissions request through the existing CanEditScript() and CanEditNotecard() methods. 
This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions.
Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts.
For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code
This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts
 2010-04-19 21:02:36 +01:00
Melanie
21cad5d3ac All scripts are now created suspended and are only unsuspended when the object 
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
 2010-04-19 06:29:26 +01:00
Justin Clark-Casey (justincc)
e9926d13cf minor: use the static ascii and utf8 encodings instead of instantiating our own 2010-04-16 22:38:42 +01:00
Justin Clark-Casey (justincc)
bf3956aeb0 Add --skip-assets option to load oar. 
This allows you to load an oar without loading its assets.  This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon.  At this point there will also be better documentation.
 2010-04-16 22:29:11 +01:00
Justin Clark-Casey (justincc)
48d2e8309a check group membership and powers with the groups module rather than just the client's active group id 
this resolves the earlier issue where notecards/scripts shared with group could only be edited if the user had that group active
 2010-04-05 20:44:19 +01:00
Melanie
f020bd3206 Fix a nullref in permissions when returning objects via right-click 2010-03-20 15:49:39 +00:00
John Hurliman
5e65bef805 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-19 15:17:15 -07:00
Dan Lake
62e0b53ca4 Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. 2010-03-19 15:16:44 -07:00
Dan Lake
859bc717a4 Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>). 2010-03-19 15:16:35 -07:00
Melanie
e0289bb432 Flesh out the new permission method 2010-03-18 19:58:21 +00:00
Melanie
734b0416de Unify a previous refactor of object return with the older solution. We 
really don't need two methods doing the same thing, but differently.
 2010-03-18 18:57:29 +00:00
Dan Lake
73e9b0be72 Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class. 
This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
 2010-03-17 11:21:27 -07:00
John Hurliman
b4dcdffb50 Fixed several unhandled exceptions and performance issues with PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time 2010-03-16 11:50:22 -07:00
John Hurliman
33f5d0d1e9 * UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context 
* OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
 2010-03-15 14:17:17 -07:00
Melanie
04a6b1caf8 Reintroduce a check that was dropped from permissions 2010-03-10 05:31:34 +00:00
Jeff Ames
f58a0394ed Formatting cleanup. Add copyright notices. 2010-03-10 13:15:36 +09:00
Melanie
88771aeed3 Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator 
to use that stored value.
 2010-03-09 23:11:28 +00:00
Melanie
c7590bfd50 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-09 22:44:14 +00:00
unknown
98f91a252c - parcel blocking, region crossing blocking, teleport blocking 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-03-09 22:43:55 +00:00
John Hurliman
01218093a6 * Typo fixes 
* Performance improvement in the expensive GenerateClientFlags()
 2010-03-09 12:06:53 -08:00
Melanie
38ea1dd5c8 Merge branch 'master' into presence-refactor 2010-03-01 01:01:32 +00:00
Justin Clark-Casey (justincc)
93967d4a1c fix bug where region settings loaded via an oar (water height, terrain textures, etc.) were not being persisted to the database 
this meant that the loaded settings would disappear after a restart
 2010-02-26 18:30:05 +00:00
John Hurliman
df76e95aa2 Changed asset CreatorID to a string 2010-02-22 14:18:59 -08:00
John Hurliman
71c6559a91 Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor 2010-02-22 14:10:19 -08:00
John Hurliman
7665aad002 * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it 2010-02-22 13:27:17 -08:00
Melanie
1f45e6c649 Merge branch 'master' into presence-refactor 
This brings presence-refactor up to master again
 2010-02-22 03:00:59 +00:00
Diva Canto
2e7aa387f7 One more test running. 2010-02-21 19:11:48 -08:00
Justin Clark-Casey (justincc)
c767a7901c forestall bug reports about the Command error: System.EntryPointNotFoundException: CreateZStream save/load oar/iar issue by telling the user what the likely problem is 2010-02-19 22:30:46 +00:00
Jeff Ames
af265e001d Formatting cleanup. 2010-02-15 19:21:56 +09:00
Melanie
c033223c63 Merge branch 'master' into presence-refactor 2010-02-15 00:20:48 +00:00
Revolution
9821c4f566 Revolution is on the roll again! :) 
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).

Direct flames and kudos to Revolution, please

Signed-off-by: Melanie <melanie@t-data.com>
 2010-02-14 22:18:46 +00:00
Justin Clark-Casey (justincc)
00800c59d3 Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522 
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
 2010-02-12 23:13:35 +00:00
Melanie
baaf660511 Merge branch 'master' into presence-refactor 
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
 2010-02-08 15:53:38 +00:00
Justin Clark-Casey (justincc)
bde7f361fa minor: remove one mono compiler warning 2010-02-03 19:46:33 +00:00
Diva Canto
42f978a478 * HGScene is no more. 
* Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module
 2010-01-30 09:23:07 -08:00
Justin Clark-Casey (justincc)
0cf88b34c9 use common sop2 setup for TestMergeOarV0_2() 2010-01-29 21:45:07 +00:00
Justin Clark-Casey (justincc)
68c7218fa1 make TestSaveOarV0_2() use a common part2 construction 2010-01-29 21:42:27 +00:00
Justin Clark-Casey (justincc)
0c3043a298 use common part1 createio nin TestMergeOarV0_2() 2010-01-29 21:37:25 +00:00
Justin Clark-Casey (justincc)
055d991cc1 minor: swap which part uses the automatically set up scene in TestMergeOarV0_2() 2010-01-29 21:33:11 +00:00
Justin Clark-Casey (justincc)
75dcd721de use common part1 creation in ArchiverTests.TestLoadOarV0_2() 2010-01-29 21:27:14 +00:00
Justin Clark-Casey (justincc)
115e66218e refactor out scene object 1 creation n ArchiverTetss 2010-01-29 21:10:14 +00:00
Justin Clark-Casey (justincc)
c1da07e4eb factor out scene setup in ArchiverTests 2010-01-29 20:59:56 +00:00
Justin Clark-Casey (justincc)
ae2174d8f5 Add method to get all items with the same name from a particular prim 
Extend load oar test to check loading of a sound item
 2010-01-29 18:11:53 +00:00
Melanie
a87a247f05 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:21:06 +00:00
Melanie
ee12b00cfa Fixes inconsistencies in the permissions module. Adds a region_manager_is_god 
configurable. Previously, estate managers could enter god mode, but would
not have any powers. Now estate managers can enter god mode only if this
option is true, and then will have real god powers.
 2010-01-28 14:34:31 +00:00
Diva Canto
70465f4c90 Removed obsolete interface IHyperlink. 2010-01-24 16:23:18 -08:00
Melanie
1254a5e50c Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-01-23 15:19:05 +00:00
Revolution
ec3c31e61e Updates all IRegionModules to the new style region modules. 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-01-23 15:18:52 +00:00
Justin Clark-Casey (justincc)
1df69be9a6 Add first part of test for checking restore of task inventory items on oar load 
Passes but not yet complete
 2010-01-22 20:32:34 +00:00