aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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-106-69/+46
| |\
| | * Adjust hypergrid console commands to latest changes.Marck2010-12-101-64/+41
| | |
| | * 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
| * 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...
* | 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
| |
* | 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"
* | 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-0568-987/+2318
| | |\
| | | * 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-core' into mantis5110Jonathan Freedman2010-11-2317-99/+307
| | |\ \
| | * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-2165-1077/+1971
| | |\ \ \
| | * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-2118-111/+167
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-0530-91/+289
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-311-2/+2
| | |\ \ \ \ \ \
| | * | | | | | | * better semantics for link-region commandJonathan Freedman2010-10-301-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * actually parse name for new link-region command
| | * | | | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-307-60/+168
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-5/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-3016-486/+342
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-299-70/+64
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-296-82/+270
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-23/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-2941-934/+1261
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-251-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-243-3/+46
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-243-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | * throw debug message when no HomeURI is setJonathan Freedman2010-10-241-0/+2
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | * a bit of additional debugging:Jonathan Freedman2010-10-232-8/+6
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵sacha2010-12-0419-295/+592
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | | | | | | | | | | | | | | | | | add more detail to the log in case of FORM Timeoutsacha2010-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cause nothing relevant are in the services logs