aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-1229-238/+351
|\
| * Revert "Another stab at mantis #5256"Diva Canto2010-12-102-32/+25
| | | | | | | | This reverts commit ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-1011-146/+245
| |\
| | * Remove the restriction that you have to be logged in when loading/saving iarsJustin Clark-Casey (justincc)2010-12-112-72/+70
| | | | | | | | | | | | This is pointless as we're supplying the password on the command line
| | * If we're saving an IAR with --profile information, then label this a version ↵Justin Clark-Casey (justincc)2010-12-111-5/+22
| | | | | | | | | | | | 1.0 IAR since it isn't compatible with older OpenSim releases.
| | * Drop current OAR version back to 0.5 since these are currently now ↵Justin Clark-Casey (justincc)2010-12-114-38/+38
| | | | | | | | | | | | | | | | | | 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.
| | * Normalization of OSSL function names.Marck2010-12-104-31/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Another stab at mantis #5256Diva Canto2010-12-102-25/+32
| |/
| * Revert "A stab at mantis #5256. Separate ScenePresence updates from ↵Diva Canto2010-12-101-150/+128
| | | | | | | | | | | | SceneObject updates, and place them in different queues." This reverts commit f84905e2949d61239c8bff815f8061a9435c124c.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-12-107-69/+46
| |\
| | * Adjust hypergrid console commands to latest changes.Marck2010-12-101-64/+41
| | |
| | * update libode for 64 bit linux to r1755 (post 0.11.1) from ode 0.10.1Justin Clark-Casey (justincc)2010-12-101-0/+0
| | | | | | | | | | | | 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.
| | * fix the minimap sitting avatar location bugJustin Clark-Casey (justincc)2010-12-101-1/+1
| | | | | | | | | | | | a sitting avatar should have it's offset position added to the scene object, not its absolute position
| | * minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-12-104-4/+4
| | |
| * | A stab at mantis #5256. Separate ScenePresence updates from SceneObject ↵Diva Canto2010-12-101-128/+150
| |/ | | | | | | updates, and place them in different queues.
| * Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵Diva Canto2010-12-095-3/+9
| | | | | | | | command. mantis #5259
| * Make configs consistent, as per mantos #5258Diva Canto2010-12-093-17/+27
| |
| * Minor bug fixes. Hunting down mantis #5259Diva Canto2010-12-092-2/+4
| |
| * Fixed wrong commentDiva Canto2010-12-081-1/+1
| |
| * Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase ↵Diva Canto2010-12-081-1/+1
| | | | | | | | yet...
| * Update ode.dll to r1754justincc2010-12-091-0/+0
| |
| * Update libode.so to r1755.Justin Clark-Casey (justincc)2010-12-091-0/+0
| | | | | | | | | | 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
* | Fix border fence for physicals. Fix llRotLookAt() for Vehicles.Kitto Flora2010-12-112-153/+61
| |
* | Allow floats in the list for llSetPayPrice and silently convert them to int,Melanie2010-12-111-4/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-095-64/+316
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-12-092-42/+283
| |\
| | * Added ability for GetTexture to serve multiple formats. The format may come ↵Diva Canto2010-12-082-42/+283
| | | | | | | | | | | | 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>.
| * | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-096-0/+132
| |/ | | | | | | whether or not an agent is allowed there as a root agent.
| * Added an exception handler on CreateObject handler, just in case there's an ↵Diva Canto2010-12-071-20/+31
| | | | | | | | exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs)
| * Removed extraneous left-/ on /object/ subpath. Bug introduced during region ↵Diva Canto2010-12-071-1/+1
| | | | | | | | URLs clean up.
| * change doc. trivial commit to get panda to rebuildJustin Clark-Casey (justincc)2010-12-081-1/+1
| |
| * Remove old Freeswitch configurationsMelanie2010-12-071-33/+0
| |
* | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-096-0/+132
| | | | | | | | whether or not an agent is allowed there as a root agent.
* | Prevent sending of attachment data to any client if the attachmentMelanie2010-12-081-0/+21
| | | | | | | | is not actually attached to any avatar. Another stab ad fixing "HUD hair"
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-071-33/+0
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-076-38/+112
| |\ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Remove old Freeswitch configurationsMelanie2010-12-071-33/+0
| | | |
* | | | Allow TPing multiple people in the friends list in one go.Melanie2010-12-071-5/+10
| |/ / |/| |
* | | Update calling card interfaceMelanie2010-12-071-1/+1
| | |
* | | Add the interface needed to revive calling cardsMelanie2010-12-072-0/+26
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-0728-215/+243
|\ \ \ | |/ / | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-0627-214/+242
| |\ \ | | |/
| | * Fixed some inconsistency with trailing /. Made debug messages consistent. ↵Diva Canto2010-12-0511-35/+47
| | | | | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB.
| | * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-0579-1150/+2402
| | |\
| | | * Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-031-19/+6
| | | |\
| | | | * Simplify updating of agent inventory assets. Make newly created asset IDsMelanie2010-12-041-19/+6
| | | | | | | | | | | | | | | | | | | | random rather than using IDs known by the client ahead of time.
| | | * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-034-170/+158
| | | |\ \ | | | | |/
| | | * | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-032-0/+93
| | | |\ \
| | | * \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-032-61/+54
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of /var/git/opensim/opensim mirror account2010-12-031-0/+83
| | | |\ \ \ \