Melanie
663a626a6f
Apply the useful part of diva's patch that was skipped
2010-12-12 08:57:26 +00:00
Diva Canto
8ea4933742
Fixed wrong configuration variable names.
2010-12-11 18:17:07 -08:00
Melanie
28022a9198
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:22:50 +00:00
Melanie
fe61c00958
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:22:27 +00:00
Melanie
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
Diva Canto
4d16ecf889
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-11 17:07:08 -08:00
Diva Canto
797ca8d0e7
Fixes the nudge movements!
2010-12-11 17:06:17 -08:00
Kitto Flora
95a915efd8
Fix border fence for physicals. Fix llRotLookAt() for Vehicles.
2010-12-11 21:04:03 +00:00
Marck
69538d14d4
More OSSL function name normalization, this time for osParcelSetDetails.
2010-12-11 11:41:45 +01:00
Diva Canto
c42876df67
Revert "Another stab at mantis #5256"
...
This reverts commit ccb4f958c0
.
2010-12-10 23:32:50 -08:00
Diva Canto
18b10fab60
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 23:16:47 -08:00
Diva Canto
ccb4f958c0
Another stab at mantis #5256
2010-12-10 23:16:26 -08:00
Justin Clark-Casey (justincc)
b46de6e025
Remove the restriction that you have to be logged in when loading/saving iars
...
This is pointless as we're supplying the password on the command line
2010-12-11 03:09:00 +00:00
Melanie
711db25dfa
Allow floats in the list for llSetPayPrice and silently convert them to int,
2010-12-11 03:31:57 +01:00
Justin Clark-Casey (justincc)
387f743993
If we're saving an IAR with --profile information, then label this a version 1.0 IAR since it isn't compatible with older OpenSim releases.
2010-12-11 02:18:16 +00:00
Justin Clark-Casey (justincc)
373ef594ba
Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.
...
Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
2010-12-11 01:57:32 +00:00
Marck
b512ecd1dc
Normalization of OSSL function names.
...
Added the following replacement functions for compliance to the OSSL standards stated on the wiki:
osGetTerrainHeight
osSetTerrainHeight
osGetSunParam
osSetSunParam
osSetPenColor
The functions that do not comply to the standard give a warning when used but work normally otherwise.
The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour".
The following two functions have been renamed because they are not enabled yet aynway:
osWindParamSet => osSetWindParam
osWindParamGet => osGetWindParam
2010-12-10 22:20:35 +01:00
Diva Canto
d8fd917076
Revert "A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues."
...
This reverts commit f84905e294
.
2010-12-10 12:40:12 -08:00
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
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
7fef89847c
Merge branch 'master' into careminster-presence-refactor
2010-12-09 02:24:12 +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
Melanie
f28dc77ab4
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 02:01:41 +01: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
80b84e4bad
Prevent sending of attachment data to any client if the attachment
...
is not actually attached to any avatar. Another stab ad fixing "HUD hair"
2010-12-08 00:08:14 +01:00
Melanie
1e7b7ffd6b
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 23:43:53 +01:00
Melanie
b9f54fca5d
Allow TPing multiple people in the friends list in one go.
2010-12-07 23:01:42 +01:00
Melanie
c0d3ab59e6
Remove old Freeswitch configurations
2010-12-07 15:30:10 +00:00
Melanie
dd416f4b63
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 15:27:50 +00:00
Melanie
c8f0c8ebc4
Remove old Freeswitch configurations
2010-12-07 15:24:17 +00:00
Melanie
549f90c5b5
Update calling card interface
2010-12-07 04:45:28 +01:00
Melanie
a4f7937eb3
Add the interface needed to revive calling cards
2010-12-07 03:08:48 +01:00
Melanie
b325721d6f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 01:07:57 +01:00