UbitUmarov
cf9ebd301c
bug fixs, added a default physics shape estimator based on being a mesh or not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
2012-03-14 18:24:04 +00:00
Melanie
c0f70d17fc
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-03-14 11:33:51 +00:00
Diva Canto
d6dd3c42d1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-13 20:16:19 -07:00
Diva Canto
479dd65a63
Teleports: bounce off repeated requests of teleporting the same agent. Some scripts do that, and that fails the whole thing.
2012-03-13 20:15:38 -07:00
Diva Canto
5a09572393
Minor sanity check on simulation agent handler (content type)
2012-03-13 20:14:51 -07:00
Justin Clark-Casey (justincc)
95ec96bf86
refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make it more understandable as to what it is and what it does (hold a thread pool work item for a waiting of in-progress event)
...
Also add other various illustrative comments
2012-03-14 00:29:36 +00:00
Melanie
8388182707
Implement llSetPrimitiveParams for physics shape and material. Add
...
llSetPhysicsMaterial support.
2012-03-13 22:20:12 +01:00
Melanie
d4e6834f99
Hook up the new cap to the SOP changes
2012-03-13 20:49:16 +01:00
Melanie
f53c322b7e
Merge branch 'ubitwork'
2012-03-13 20:21:26 +01:00
UbitUmarov
577d07aa44
missed commit of extraphysics parameters serialization..
2012-03-13 19:51:41 +00:00
UbitUmarov
741badc4fa
let PhysicsShapeType none remove physics remove physics on child parts **UnTested**
2012-03-13 19:24:41 +00:00
UbitUmarov
bf2a5508de
bug fix
2012-03-13 19:17:32 +00:00
Melanie
f415eb84e1
Implement the cap to send extra physics params to the viewer. Not functional
...
yet because the parameters are not actually stored anywhere yet.
2012-03-13 20:06:39 +01:00
UbitUmarov
923db53975
let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy with it disabled...
2012-03-13 18:10:43 +00:00
UbitUmarov
5086fe9176
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-13 18:00:27 +00:00
UbitUmarov
3de3b9e63c
initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
2012-03-13 17:56:32 +00:00
Diva Canto
37828c9b9a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-13 08:07:11 -07:00
Diva Canto
4eb2605c79
Datasnapshot: added "secret" to the registration/deregistration query so that data providers can verify authenticity if they want.
2012-03-13 08:06:30 -07:00
Melanie
22e0cc09ac
Ensure child prims of a phantom prim are marked as phantom
2012-03-13 13:12:14 +01:00
Melanie
ebcd4910a2
Refactor, move OjectChangeData into it's own file and rename
...
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
2012-03-13 13:08:32 +01:00
Justin Clark-Casey (justincc)
25592bbd85
Add max thread and min thread information to "xengine status" region console command
2012-03-12 21:16:05 +00:00
Robert Adams
e0dd38f672
Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().
...
.NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5
and before, WebUtil defined an extension method for Stream with the signature
Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter
is different in the two forms and depending on which compiler and/or
runtime you use, you could get one form or the other. Crashes ensue.
This change renames the WebUtil stream copy method to something that
cannot be confused with the new CopyTo method defined in .NET 4.0.
2012-03-12 10:07:04 -07:00
Melanie
1547fe959e
Change OpenSim.ini.example to reflect how to actually enable prim limits,
...
as opposed to how it was first designed.
2012-03-12 16:06:35 +00:00
Diva Canto
13fb582c12
DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the capitalization of 'name' to lower case, also in the same <grid> section.
2012-03-12 07:55:17 -07:00
Melanie
edc8a15487
Restore duplication of the SL bug where linking phantom to solid lets the
...
child prim remain phantom
2012-03-12 14:06:39 +01:00
Melanie
bfd38ecad4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 11:45:38 +01:00
Melanie
139c0665cf
Add AVATAR_MALE flag to return values of llGetAgentInfo
2012-03-12 11:44:07 +01:00
UbitUmarov
a35e00e81e
allocate UndoRedoStore only on demand
2012-03-12 07:50:14 +00:00
UbitUmarov
b5e172677d
ubitode prim select was not doing phantom case
2012-03-12 07:46:20 +00:00
UbitUmarov
6c4c500ee4
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 06:58:38 +00:00
UbitUmarov
2a17dafa04
missing file in ubitODE
2012-03-12 06:52:03 +00:00
Melanie
44ce068d6c
Allow RLV to redirect received folders to #RLV folder
2012-03-11 18:21:47 +01:00
UbitUmarov
925295f3ab
ubitOde also knows a bit more about physical phantom
2012-03-11 12:33:59 +00:00
UbitUmarov
7832889437
Physical phantoms testable with chOde. Volume detection was changed and also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED ***
2012-03-11 11:01:38 +00:00
UbitUmarov
dab7e03584
bug fix (??) in sog copy()
2012-03-11 08:43:53 +00:00
UbitUmarov
43dc0ee020
more phantom physics ( chODE and a fix in manager physicsactor
2012-03-11 07:44:34 +00:00
UbitUmarov
21a76a619f
initial steps to support physical phantoms
2012-03-11 06:32:06 +00:00
UbitUmarov
b0f01cec98
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 03:57:59 +00:00
Diva Canto
824eb7ed20
Added osGetGridGatekeeperURI()
2012-03-10 19:51:28 -08:00
UbitUmarov
1f7c0c2ea0
cleanup + comments
2012-03-11 03:28:17 +00:00
UbitUmarov
53bda83cc2
cleanup + comments
2012-03-11 03:14:15 +00:00
UbitUmarov
80160c128d
coments change..
2012-03-11 02:58:56 +00:00
UbitUmarov
dba0d79833
minor changes on updates control on doChangeObject(..)
2012-03-11 02:55:39 +00:00
Melanie
4f7ec1d691
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-03-11 01:55:36 +01:00
Melanie
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
UbitUmarov
e4e6f781a6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 00:53:53 +00:00
Melanie
0a4056ad22
Merge branch 'ubitwork'
2012-03-11 01:47:36 +01:00
UbitUmarov
ab235abc46
Changed undo redo internals. moved exec code to UndoState.cs from sop that now only sees a unified UndoRedoStore class, added size limit on buffers so only last 5 undo/redo are kept. (5 is hardcode like it was ) ***UNTESTED***
2012-03-11 00:36:34 +00:00
UbitUmarov
908abb1c3d
BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
2012-03-10 20:32:19 +00:00
Diva Canto
291dc39691
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-10 08:09:43 -08:00