ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-25 07:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,064 Commits 5 Branches 106 Tags
be60c0b0105e2d6929bb331ff86dfbcc45261221
Commit Graph

616 Commits

Author SHA1 Message Date
UbitUmarov
de49440839 dont send a full grp update on stopmovetotarget. just a rootpart terse 2013-01-16 22:17:10 +00:00
UbitUmarov
d7f0bf04f6 update the last information sent in terse updates where they are sent to all 
clients and not only on Scheduled sends
 2013-01-11 16:24:48 +00:00
Melanie
dd416298f1 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-11-04 22:37:28 +00:00
Melanie
5328808b18 Make sure we're not accessing a physics scene if we're not in one yet. 2012-10-30 21:19:00 +01:00
Melanie
d15d71a7ef Put back the collision sound shim into SOP 2012-10-30 01:28:03 +00:00
Melanie
48569e856a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-10-30 01:02:20 +00:00
SignpostMarv
c5af16aef8 shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string 2012-10-29 23:39:00 +00:00
SignpostMarv
5abcecc735 moving SendSound from SceneObjectPart to ISoundModule 2012-10-29 23:39:00 +00:00
SignpostMarv
af39af1cc4 fixing a bug in SceneObjectPart.SendSound where sounds would always come from the root prim rather than the source prim 2012-10-29 23:39:00 +00:00
SignpostMarv
57940087d1 Factoring out a superfluous local variable & repeated assignment in SceneObjectPart.SendSound as linksets are only meant to have a single owner 2012-10-29 23:38:59 +00:00
SignpostMarv
22693304fb removing superfluous lines from SceneObjectPart.SendSound 2012-10-29 23:38:59 +00:00
SignpostMarv
a68e2fe169 transposing preload sound onto sound module 2012-10-29 23:38:58 +00:00
SignpostMarv
1c618843b8 formatting changes to SceneObjectPart.SendSound; consistent indentation 2012-10-29 23:38:58 +00:00
SignpostMarv
32db725dd7 SceneObjectPart.SendSound can exit early if a sound module was not found. 2012-10-29 23:38:58 +00:00
SignpostMarv
f4fe8763ad Changing the logic order in the TaskInventory iterator of ScenObjectPart.SendSound, since we can currently have non-unique object inventory names so we should check the asset type first. 2012-10-29 23:38:58 +00:00
SignpostMarv
b42cfe49a2 Replacing double-if block in SceneObjectPart.SendSound with Util.Clip 2012-10-29 23:38:57 +00:00
UbitUmarov
32171708c3 normalize quaternion.Slerp outputs 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-10-19 01:37:46 +01:00
Melanie
a2c93133be Remove extraneous calls to the now commented CheckSculptAndLoad 2012-10-18 21:23:57 +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
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
6ce93b22d1 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-10-12 19:05:06 +01:00
UbitUmarov
d554c0d574 normalize quaternion.Slerp outputs 2012-10-10 01:37:59 +01: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
48d8fbc9ae bug fix + make costs visible for testing 2012-10-07 08:53:55 +01:00
UbitUmarov
78ce7a0a04 [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts 
now
 2012-10-07 01:20:52 +01:00
Dan Lake
91ca3117cb Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full update. There should be a better way to indicate which properties have changed that is non LLUDP-centric 2012-10-05 17:32:07 -07:00
UbitUmarov
9988558ec1 meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled 
for all physics engines)
 2012-10-03 23:14:56 +01:00
Melanie
001ec0e2e6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-09-27 17:29:44 +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)
b9934fc4db Don't store undo states if a scene object is manipulated when it is not in a scene. 
Adds regression test for this.
 2012-09-26 23:31:10 +01:00
Justin Clark-Casey (justincc)
31c636f1e4 refactor: Change control structures in SOP.StoreUndoState() to reduce nesting. 2012-09-26 23:25:50 +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
Justin Clark-Casey (justincc)
327320d1a7 Enforce existing 5 action hardcoded undo limit. 
This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source.
This commit enforces that limit, which will soon become configurable.
Regression test for undo limit added
Should help with http://opensimulator.org/mantis/view.php?id=6279
 2012-09-26 22:49:44 +01:00
Justin Clark-Casey (justincc)
90dd5844d6 Add basic undo/redo regression tests. 2012-09-26 21:28:43 +01:00
Melanie
a5d969d92f Comment out asset error for sculpts/meshes. If an asset is missing it's missing. 
We can't put it back so we don't need to know.
 2012-09-23 20:57:36 +02:00
Melanie
21c476228a Merge branch 'avination' into careminster 2012-09-10 13:53:00 +01:00
Melanie
fd92560649 Merge branch 'avination' into careminster 2012-08-31 00:34:22 +01:00
UbitUmarov
a7281003d8 move keyframemotion.copy from sop.copy to sog.copy, where there is 
newgroup information avaiable.
 2012-08-30 01:30:56 +01:00
UbitUmarov
c821153a4f [possible still bad] make use of keyframemotion.copy on sop.copy, replacing 
fromdata(seralize). for now its called with null group since sop.copy()
hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
 2012-08-30 00:15:46 +01:00
UbitUmarov
ef6e007a4c [possible still very broken] mess around keyframes. timer events 
threads overlaps, some null objects exceptions, region crossing...
 2012-08-28 03:21:03 +01:00
Melanie
c557684666 Fix bad child prim permissions that can make objects change perms after rezzing 
Port from Avination
 2012-08-24 00:15:30 +01:00
Melanie
7fca69222b Merge branch 'avination' into careminster 2012-08-24 00:07:56 +01:00
Melanie
c1a0c7fad1 Fix bad child prim permissions that can make objects change perms after rezzing 2012-08-23 23:09:32 +02:00
Melanie
f8603a215d Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-08-23 01:41:47 +01:00
SignpostMarv
481c00f50a refactoring out SetFaceColor 2012-08-20 23:10:25 +01:00
SignpostMarv
ede3b9ab07 making use of implicit operators and Util.Clip handling of Vector3 2012-08-20 23:10:25 +01:00