0a9a8cc680
Restored SceneObjectSerializer.SOGToXml2() as in opensim trunk (master).
2010-12-23 10:29:12 -08:00
2b390f2436
Fixed issues with save and retrieve appearance from grid.
2010-12-14 15:06:31 -08:00
c7923338bc
Merge branch 'master' into danmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
bin/OpenSim.exe.config
2010-12-09 15:49:40 -08:00
dc86adbd17
Fixing up Appearance handling in Region Sync modules and connectors.
2010-12-09 15:07:42 -08:00
3675bb2981
Make configs consistent, as per mantos #5258
2010-12-09 09:30:17 -08:00
baa8ddfd26
Minor bug fixes. Hunting down mantis #5259
2010-12-09 08:28:21 -08:00
ab980fc927
Fixed wrong comment
2010-12-08 19:47:05 -08:00
90bcfefe09
Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet...
2010-12-08 19:37:35 -08:00
0f240a9f7c
Update ode.dll to r1754
2010-12-09 03:16:37 +00:00
3de0749aa7
Update libode.so to r1755.
...
This revision dates from 02 Sep 2010 and has received some testing. This code will be updated in the opensim-libs repository
Updates for libode-x86_64, ode.dll and libode.dylib will follow
2010-12-09 03:10:48 +00:00
d7346dd5ff
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-09 01:55:45 +00:00
1070cffcf9
Added ability for GetTexture to serve multiple formats. The format may come as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
2010-12-08 18:53:15 -08:00
4df1d25d23
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 01:55:32 +00:00
796216e44f
Added an exception handler on CreateObject handler, just in case there's an exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs)
2010-12-07 20:05:53 -08:00
7cfb3d7e96
Removed extraneous left-/ on /object/ subpath. Bug introduced during region URLs clean up.
2010-12-07 17:17:06 -08:00
1fa9399ab8
change doc. trivial commit to get panda to rebuild
2010-12-08 00:41:33 +00:00
c0d3ab59e6
Remove old Freeswitch configurations
2010-12-07 15:30:10 +00:00
72748746d5
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
2010-12-05 19:43:24 -08:00
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
6639aaeed4
Merge branch 'master' of /var/git/opensim/
2010-12-03 22:00:08 -08:00
cdd0df9aae
Merge branch 'master' of /var/git/opensim/
2010-12-03 21:30:05 -08:00
4ca108f85e
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 04:50:24 +00:00
89fec4ff5b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-04 04:25:08 +00:00
ea17b262a3
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:24:55 +00:00
755180612a
Merge branch 'master' of /var/git/opensim/
2010-12-03 18:50:03 -08:00
7b6b4501b7
minor: add class doc line to older region module example code pointing towards newer
2010-12-04 02:49:41 +00:00
f268cd7c53
comment out the extension attribute
2010-12-04 02:47:29 +00:00
57b5263ecf
add bare bones shared example module
2010-12-04 02:46:59 +00:00
2756e8fd67
Merge branch 'master' of /var/git/opensim/
2010-12-03 18:40:03 -08:00
510b55c7f0
refactor some common code in RegionModulesControllerPlugin
...
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
cc471d9ca6
Merge branch 'master' of /var/git/opensim/
2010-12-03 17:40:03 -08:00
c010491d34
correct the id of the example module
2010-12-04 01:38:32 +00:00
a06032d96e
Add the most bare bones non-shared region module example. Not active unless the correct line is uncommented.
2010-12-04 01:36:35 +00:00
935929c2b8
Merge branch 'master' of /var/git/opensim/
2010-12-03 17:10:03 -08:00
0ab774d484
add warning decals and information to RegionModule.cs in probably non-functional OpenSim.Region.Examples.SimpleModule project
2010-12-04 01:06:29 +00:00
9668fb4e31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-04 00:57:18 +00:00
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
6770e43ef0
Merge branch 'master' of /var/git/opensim/
2010-12-03 16:50:02 -08:00
cc573e97d5
Merge branch 'master' of /var/git/opensim/
2010-12-03 16:00:27 -08:00
b69c5d6633
minor: change OpenSimBase log messages associated with newer module loader to make the association clear
2010-12-03 23:50:09 +00:00
df860516bf
Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
...
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
ffaaa5c750
Merge branch 'master' of /var/git/opensim/
2010-12-02 16:20:08 -08:00
7e72afcb3e
Only force prim persistence before delete if the prim is the result of an unpersisted delink
...
This considerably improves delete performance for objects with large linksets
2010-12-03 00:12:59 +00:00
3da12c2d3f
Merge branch 'master' of /var/git/opensim/
2010-12-01 18:10:02 -08:00
5246d98b8d
Stop LLUDPServer sending updates after object deletes by always queueing deletes
...
If an LL 1.23.5 client (and possibly earlier and later) receives an object update after a kill object packet, it leaves the deleted prim in the scene until client relog
This is possible in LLUDPServer if an object update packet is queued but a kill packet sent immediately.
Beyond invasive tracking of kill sending, most expedient solution is to always queue kills, so that they always arrive after updates.
In tests, this doesn't appear to affect performance.
There is probably still an issue present where an update packet might not be acked and then resent after the kill packet.
2010-12-02 02:01:01 +00:00
26569a7cd0
minor: add some method doc
2010-12-02 02:01:01 +00:00
d60ace97bf
Merge branch 'master' of /var/git/opensim/
2010-12-01 16:20:03 -08:00
f1a7847532
Deleted obsolete config files from old OpenSim.Grid.
2010-12-01 16:19:27 -08:00
6f3fbca5a3
Merge branch 'master' of /var/git/opensim/
2010-12-01 16:10:15 -08:00
7d24dbca3c
Added some comments. Better than listening to the boring speaker...
2010-12-01 16:01:22 -08:00
Huaiyu (Kitty) Liu