ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-03 07:26:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,261 Commits 5 Branches 88 Tags
b168d690bd32c3bbb28e65bccfa359ea89dc81f9
Commit Graph

606 Commits

Author SHA1 Message Date
Melanie
ffcee82b1d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2013-06-30 18:27:30 +01:00
Justin Clark-Casey (justincc)
ce9b1320d2 Improve situation where editing just the root prim of an attachment causes other prims to be set to very far off positions on reattach. 
Functionally the same as the patch by tglion in http://opensimulator.org/mantis/view.php?id=5334
However, not yet perfect - after editing just root prim on reattach the position is still wrong, though other prims are not set to far off positions.
 2013-06-25 00:41:46 +01:00
Justin Clark-Casey (justincc)
4b00203fa5 Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 structs 2013-06-25 00:15:55 +01:00
Melanie
25ed1658ca Merge branch 'master' into careminster 2013-06-23 01:35:09 +01:00
Melanie
4bf1afe300 Fix prim locking to behave like SL 2013-06-23 01:34:35 +01:00
Melanie
9975c5674c Merge branch 'master' into careminster 2013-06-13 02:49:43 +01:00
teravus
3357300362 * This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage. 2013-06-12 18:13:00 -05:00
Melanie
fe4a67efb6 Merge branch 'avination-current' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
	OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
	OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
 2013-06-06 03:20:15 +01:00
Melanie
81ad9255b5 Hook up Keyframe motion to almost everything. Failing to cross a sim border 
may yield unexpected results in some cases. No database persistence yet,
 2013-06-06 03:03:05 +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
e2e839a0cd Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
 2013-05-24 01:11:49 +01:00
Justin Clark-Casey (justincc)
eb2bd9d203 minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy() 
As a struct, Vector3 has already been cloned by MemberwiseClone()
 2013-05-24 00:46:58 +01:00
Justin Clark-Casey (justincc)
9b56f99326 Fix bug where a cloned object would report the wrong llGetNumberOfPrims() when avatars had been sitting on the original and a different avatar sat on the copy within the same opensim session. 
This was because the sitting avatars list was being cloned rather than reset.
Addresses http://opensimulator.org/mantis/view.php?id=6649
 2013-05-23 23:52:07 +01:00
Melanie
13cd8c17d7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 2013-05-11 02:35:26 +01:00
Justin Clark-Casey (justincc)
3290cd09d3 remove pointless region handle paramter from IClientAPI.SendKillObject() 2013-05-09 18:12:17 +01:00
Justin Clark-Casey (justincc)
2cb2f1d7e3 Fix issue where objects removed via llDie() would not disappear for users looking in from neighbouring sims. 
This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason.
Added regression test for this case.
This fixes http://opensimulator.org/mantis/view.php?id=6627
 2013-05-09 18:02:19 +01:00
Melanie
9b83e53b28 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 21:59:44 +01: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
5f4c4df227 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-26 03:40:06 +00: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