5086fe9176
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-13 18:00:27 +00:00
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
37828c9b9a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-13 08:07:11 -07:00
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
22e0cc09ac
Ensure child prims of a phantom prim are marked as phantom
2012-03-13 13:12:14 +01:00
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
25592bbd85
Add max thread and min thread information to "xengine status" region console command
2012-03-12 21:16:05 +00:00
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
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
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
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
bfd38ecad4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 11:45:38 +01:00
139c0665cf
Add AVATAR_MALE flag to return values of llGetAgentInfo
2012-03-12 11:44:07 +01:00
a35e00e81e
allocate UndoRedoStore only on demand
2012-03-12 07:50:14 +00:00
b5e172677d
ubitode prim select was not doing phantom case
2012-03-12 07:46:20 +00:00
6c4c500ee4
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 06:58:38 +00:00
2a17dafa04
missing file in ubitODE
2012-03-12 06:52:03 +00:00
44ce068d6c
Allow RLV to redirect received folders to #RLV folder
2012-03-11 18:21:47 +01:00
925295f3ab
ubitOde also knows a bit more about physical phantom
2012-03-11 12:33:59 +00:00
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
dab7e03584
bug fix (??) in sog copy()
2012-03-11 08:43:53 +00:00
43dc0ee020
more phantom physics ( chODE and a fix in manager physicsactor
2012-03-11 07:44:34 +00:00
21a76a619f
initial steps to support physical phantoms
2012-03-11 06:32:06 +00:00
b0f01cec98
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 03:57:59 +00:00
824eb7ed20
Added osGetGridGatekeeperURI()
2012-03-10 19:51:28 -08:00
1f7c0c2ea0
cleanup + comments
2012-03-11 03:28:17 +00:00
53bda83cc2
cleanup + comments
2012-03-11 03:14:15 +00:00
80160c128d
coments change..
2012-03-11 02:58:56 +00:00
dba0d79833
minor changes on updates control on doChangeObject(..)
2012-03-11 02:55:39 +00:00
4f7ec1d691
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-03-11 01:55:36 +01:00
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
e4e6f781a6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 00:53:53 +00:00
0a4056ad22
Merge branch 'ubitwork'
2012-03-11 01:47:36 +01:00
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
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
291dc39691
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-10 08:09:43 -08:00
05e821c444
Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thread.
...
This was previous behaviour anyway.
2012-03-10 03:11:28 +00:00
6e26f17923
minor: In IAR save, log when we start adding the control file rather than saying afterwards that we added it.
2012-03-10 02:13:17 +00:00
5507752dc5
minor: rearrange some save oar messages so they say what they're about to do rather than what they've just done.
2012-03-10 02:11:30 +00:00
1693799623
On OAR saving, try fetch assets serially rather than firing all the requests at the asset service at once.
...
This may (or may not) improve reliability for http://opensimulator.org/mantis/view.php?id=5898
Quick tests show that save time is the same.
2012-03-10 02:03:07 +00:00
3a5928f813
Add satguru and Fernando to contributors
2012-03-10 01:31:27 +00:00
d6ebf2d6ca
Add ability to specify a default estate to be used when creating regions.
...
This is configured in the new [Estates] section of OpenSim.ini.
If a default estate is configured then all new regions are automatically joined to it instead of asking the user.
If the default estate does not already exist then it is created.
Current default behaviour remains the same - the user is asked for estate details when necessary.
Thanks to Frenando Oliveira for the patch which I adapated further.
2012-03-10 01:27:05 +00:00
7b8e9d88e3
Serialize all web requests to a particular host:port pair; only applied to the PostToService variants.
2012-03-09 16:53:51 -08:00
bdc968f1fc
Factor out common default animations code into SLUtil. LLClientView now makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy.
...
As per opensim-users mailing list discussion.
2012-03-09 23:57:24 +00:00
3dbf754651
Merge branch 'master' into careminster
2012-03-09 23:00:24 +00:00
5c5a493791
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-09 22:59:23 +00:00
35f2479858
fix for NPC not playing internal animations
2012-03-09 22:58:59 +00:00
a58152bd2a
More on inventory transfer hold ups:
...
- Added an inventory cache for caching root and system folders
- Synchronized the remote inventory connector, so that all the remote inventory calls are serialized
This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
2012-03-09 12:59:24 -08:00
81869c4a3f
More on HG inventory transfers. Move the FireAndForget higher up.
2012-03-09 09:48:12 -08:00
0e5e324a2c
ubitOde bug
2012-03-09 17:20:49 +00:00
UbitUmarov