ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-30 21:38:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,498 Commits 5 Branches 88 Tags
1fc5dadc604daebd4aeaf6954ac64f45fdfc7a2f
Commit Graph

593 Commits

Author SHA1 Message Date
Melanie Thielker
a30ad71651 Guard against Scene being null in attachments it the wearing avatar is in the process of logging out. 2014-03-25 03:17:44 +01:00
Melanie
ddf67bf929 Mono 2.0 fix - call ToArray() explicitly 2013-09-08 19:41:51 +02:00
Melanie
8e9d6c6c56 Fix prim locking to behave like SL 2013-06-23 01:14:07 +02:00
Melanie
689969e143 * This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage. 
Conflicts:

	OpenSim/Data/SQLite/SQLiteSimulationData.cs
 2013-06-13 02:50:39 +01:00
Melanie
a348c8e44a Allow Linden trees to preserve their type when taken into inventory and rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects. 2013-05-26 14:11:48 +02:00
Melanie
4bf9c4bbb8 Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet. 
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
 2013-03-31 20:25:32 +02:00
Melanie
c341664c1b Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-24 18:56:28 +01:00
Melanie
fc1c77b42d Merge branch 'avination' into careminster 2013-01-23 19:31:27 +00:00
Melanie
da6f589885 Add accessors to allow serializing rot and position targets 2013-01-21 08:36:21 +01:00
Melanie
a291e6be93 Limit active at targets to 8 2013-01-21 01:47:54 +01:00
Melanie
2d3a57a002 Merge branch 'avination' 
Conflicts:
	OpenSim/Framework/ThrottleOutPacketType.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
 2013-01-19 21:49:33 +01:00
UbitUmarov
de49440839 dont send a full grp update on stopmovetotarget. just a rootpart terse 2013-01-16 22:17:10 +00:00
Melanie
b924e333b7 Merge branch 'avination' into careminster 2013-01-13 13:44:28 +00:00
UbitUmarov
819f4b338d remove redundant lastPhysGroupPos and lastPhysGroupRot checks 
in SOG Update(). rootpart does more complet checks
 2013-01-11 16:02:14 +00:00
Melanie
e62b14024f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-01-04 22:39:07 +00:00
Justin Clark-Casey (justincc)
9503383887 Fix llGetLinkKey() to return the last sat avatar as the last link number. 
As per http://wiki.secondlife.com/wiki/LlGetLinkKey
This is done by keeping a scene-object wide list of sitters.
This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim.
This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists
Addresses http://opensimulator.org/mantis/view.php?id=6477
 2013-01-04 20:34:39 +00:00
Melanie
569f39e124 Merge branch 'master' into careminster 2012-12-21 22:13:41 +00:00
Robert Adams
d15bfcf614 Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags. 2012-12-18 19:25:40 -08:00
Melanie
79bdf464d3 Merge branch 'avination' into careminster 2012-12-18 09:48:12 +00:00
Melanie
b9939a46a1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2012-12-18 09:44:10 +00:00
Melanie
861477d85e Fix locking for good 2012-12-18 09:32:05 +01:00
Robert Adams
8a95953bb7 BulletSim: experimentally remove unit displacement from prim border crossing test. This seems to cause border crossing to be sensed either a little early or a little late depending on which directin the object is moving. If border crossings become totally borked or someone remembers why this was displacement was done, revert this change. 2012-12-16 21:19:12 -08:00
Melanie
a5781ea9fc Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2012-12-17 01:59:50 +01:00
Melanie
7d8c2b342c Fix locking objects 2012-12-16 02:05:01 +01:00
teravus
d2695cb3f7 * Fix for Prim Locking. Prior to the merge, it was just a clone of the root part to each of the child parts. 2012-12-15 16:26:03 -05:00
Melanie
7ad082f7c3 Merge branch 'avination' into careminster 2012-11-17 02:58:14 +00:00
UbitUmarov
e642b80a79 actually remove the use of random on persist timmings 2012-11-02 17:49:54 +00:00
UbitUmarov
b8c19fe1a9 Create a new random when needed using normal time based seed instead of 
reusing a shared one than may not be valid
 2012-11-02 17:40:17 +00:00
Melanie
5b0fc60296 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
 2012-10-28 18:58:43 +00:00
Melanie
1a34f42426 Add a property to determine if a link set is stored in the database. Also, fix 
a bug where "Force object permissive" god action would fail to reset child prim
permissions.
 2012-10-28 18:34:57 +01:00
Melanie
8ce7ab721d Merge branch 'ubitwork' into avination 2012-10-19 00:12:30 +02:00
UbitUmarov
afab5f5cd1 extend coment to include all unused SOG CheckSculptAndLoad() 2012-10-18 21:13:25 +01:00
UbitUmarov
7ab83f9eb2 [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts 
now

Signed-off-by: Melanie <melanie@t-data.com>
 2012-10-18 21:13:02 +01:00
Melanie
72c925a6c9 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/Physics/OdePlugin/OdeScene.cs
 2012-10-18 20:56:34 +01:00
UbitUmarov
7228ad7a51 extend coment to include all unused SOG CheckSculptAndLoad() 2012-10-18 15:30:42 +01:00
Melanie
0ca9666932 Merge branch 'ubitwork' into avination 2012-10-17 20:46:38 +02:00
Melanie
416bc19da7 Merge branch 'avination' into careminster 2012-10-17 00:13:49 +01:00
Melanie
aba078c93f Fix perms when linking an object. Set root part perms to the perms 
of the link set to make the build floater behave consistently.
Fixes permissions exploit introduced on 23 August.
 2012-10-14 17:32:46 +02:00
Melanie
8894f4ad77 Change permissions on child prim inventory items when god mode "force 
permissive" is used.
 2012-10-08 01:34:32 +02:00
UbitUmarov
78ce7a0a04 [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts 
now
 2012-10-07 01:20:52 +01:00
Melanie
b52311b8f8 Remove a core undo call that we don't need. 2012-09-27 17:16:39 +01:00
Justin Clark-Casey (justincc)
9eca154bce Make it possible to rescale SOGs when they are not in a scene. 2012-09-27 15:48:47 +01:00
Justin Clark-Casey (justincc)
2bf42f30af Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini. 
This controls how many undo steps the simulator will store for each prim.
Default is now 20 rather than 5 as it briefly was.
The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
 2012-09-27 00:12:34 +01:00
Justin Clark-Casey (justincc)
36e3123069 Make it possible to rescale SOGs when they are not in a scene. 2012-09-26 23:17:21 +01:00
Melanie
db774d4292 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
 2012-09-16 04:11:20 +01:00
Justin Clark-Casey (justincc)
ebb394bbda Fix indentation and issues where tabs were used instead of spaces in commit 783ee949 2012-09-12 01:45:34 +01:00
Melanie
21c476228a Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01:00
Melanie
0d97beefce Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-09 13:30:24 +01:00
SignpostMarv
783ee949ea implementing per-region configuration of limits on the number of prims one can have in a linkset 
Applied with changes - patch was based on a repo different from core

Signed-off-by: Melanie <melanie@t-data.com>
 2012-09-09 12:59:25 +01:00
Melanie
056e66b3de Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into 
it's own sub-method
 2012-09-04 03:14:39 +02:00