Diva Canto
58b251506c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 11:33:09 -08:00
Diva Canto
f84905e294
A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues.
2010-12-10 11:32:46 -08:00
Marck
6f37290f4c
Adjust hypergrid console commands to latest changes.
2010-12-10 17:48:45 +01:00
Justin Clark-Casey (justincc)
3ef9a4da9a
update libode for 64 bit linux to r1755 (post 0.11.1) from ode 0.10.1
...
the same thing was actually done for ode.dll a couple of commits ago but I got the commit msg wrong (should have been r1755, not r1754). Damn these fat fingers.
2010-12-10 03:51:33 +00:00
Justin Clark-Casey (justincc)
a918c8df97
fix the minimap sitting avatar location bug
...
a sitting avatar should have it's offset position added to the scene object, not its absolute position
2010-12-10 03:46:16 +00:00
Justin Clark-Casey (justincc)
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
Diva Canto
cefdee8aaf
Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259
2010-12-09 16:52:37 -08:00
Dan Lake
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
Dan Lake
dc86adbd17
Fixing up Appearance handling in Region Sync modules and connectors.
2010-12-09 15:07:42 -08:00
Diva Canto
3675bb2981
Make configs consistent, as per mantos #5258
2010-12-09 09:30:17 -08:00
Diva Canto
baa8ddfd26
Minor bug fixes. Hunting down mantis #5259
2010-12-09 08:28:21 -08:00
Diva Canto
ab980fc927
Fixed wrong comment
2010-12-08 19:47:05 -08:00
Diva Canto
90bcfefe09
Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet...
2010-12-08 19:37:35 -08:00
justincc
f0957bb6ca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-09 03:18:14 +00:00
justincc
e9e544ddc8
Update ode.dll to r1755
2010-12-09 03:17:41 +00:00
justincc
0f240a9f7c
Update ode.dll to r1754
2010-12-09 03:16:37 +00:00
Justin Clark-Casey (justincc)
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
Melanie
d7346dd5ff
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-09 01:55:45 +00:00
Diva Canto
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
Melanie
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
Robert Adams
a036426f18
PhysActor update messages working. Avatar and prim neither move nor position correctly
2010-12-08 17:19:06 -08:00
Diva Canto
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
Diva Canto
7cfb3d7e96
Removed extraneous left-/ on /object/ subpath. Bug introduced during region URLs clean up.
2010-12-07 17:17:06 -08:00
Justin Clark-Casey (justincc)
1fa9399ab8
change doc. trivial commit to get panda to rebuild
2010-12-08 00:41:33 +00:00
Melanie
c0d3ab59e6
Remove old Freeswitch configurations
2010-12-07 15:30:10 +00:00
Robert Adams
5c6f0878a1
Add interfaces for physEngine connectors
2010-12-06 10:58:54 -08:00
Robert Adams
24bef963c7
Initial connection of phys actor
2010-12-06 10:57:39 -08:00
Diva Canto
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
Jonathan Freedman
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
opensim mirror account
6639aaeed4
Merge branch 'master' of /var/git/opensim/
2010-12-03 22:00:08 -08:00
opensim mirror account
cdd0df9aae
Merge branch 'master' of /var/git/opensim/
2010-12-03 21:30:05 -08:00
Melanie
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
Melanie
89fec4ff5b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-04 04:25:08 +00:00
Melanie
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
opensim mirror account
755180612a
Merge branch 'master' of /var/git/opensim/
2010-12-03 18:50:03 -08:00
Justin Clark-Casey (justincc)
7b6b4501b7
minor: add class doc line to older region module example code pointing towards newer
2010-12-04 02:49:41 +00:00
Justin Clark-Casey (justincc)
f268cd7c53
comment out the extension attribute
2010-12-04 02:47:29 +00:00
Justin Clark-Casey (justincc)
57b5263ecf
add bare bones shared example module
2010-12-04 02:46:59 +00:00
opensim mirror account
2756e8fd67
Merge branch 'master' of /var/git/opensim/
2010-12-03 18:40:03 -08:00
Justin Clark-Casey (justincc)
510b55c7f0
refactor some common code in RegionModulesControllerPlugin
...
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
opensim mirror account
cc471d9ca6
Merge branch 'master' of /var/git/opensim/
2010-12-03 17:40:03 -08:00
Justin Clark-Casey (justincc)
c010491d34
correct the id of the example module
2010-12-04 01:38:32 +00:00
Justin Clark-Casey (justincc)
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
opensim mirror account
935929c2b8
Merge branch 'master' of /var/git/opensim/
2010-12-03 17:10:03 -08:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
9668fb4e31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-04 00:57:18 +00:00
Justin Clark-Casey (justincc)
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
opensim mirror account
6770e43ef0
Merge branch 'master' of /var/git/opensim/
2010-12-03 16:50:02 -08:00
opensim mirror account
cc573e97d5
Merge branch 'master' of /var/git/opensim/
2010-12-03 16:00:27 -08:00
Justin Clark-Casey (justincc)
b69c5d6633
minor: change OpenSimBase log messages associated with newer module loader to make the association clear
2010-12-03 23:50:09 +00:00