aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-275-22/+54
|\
| * revert last add commitUbitUmarov2012-04-261-2/+3
| * add wearable type PHYSICSUbitUmarov2012-04-261-6/+13
| * Help big boobies to dance (avatar visualParams). May not persist and need mor...UbitUmarov2012-04-264-17/+41
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-04-257-53/+158
|\ \ | |/
| * set PIDHoverTau and not PIDTau since all physics need thatUbitUmarov2012-04-251-5/+7
| * fix chODE loosing some part positions when doing isPhysical falseUbitUmarov2012-04-242-11/+42
| * SOG bug fix in UI object changesUbitUmarov2012-04-241-11/+20
| * fix animations if sited in ground alsoUbitUmarov2012-04-241-1/+1
| * let objects/avas push avasUbitUmarov2012-04-241-2/+1
| * "save the catgirls"UbitUmarov2012-04-242-18/+13
| * display heatbeat sleep time in stats. This may not be good for general use, ...UbitUmarov2012-04-241-0/+5
| * fix Simulation time reportUbitUmarov2012-04-241-0/+7
| * some reduction on time resolution efects on spare time reportUbitUmarov2012-04-241-4/+8
| * *testing* changed stats time reports to be per reported frame and not acumul...UbitUmarov2012-04-241-11/+64
* | Merge branch 'master' into careminsterMelanie2012-04-251-15/+24
|\ \
| * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-2550-801/+1393
| |\ \
| * | | Add try/catch around Json script method registration to avoild some issuesMic Bowman2012-04-251-15/+24
* | | | Adapt some TeleportWithMomentum callsMelanie2012-04-252-2/+2
* | | | Merge branch 'master' into careminsterMelanie2012-04-253-19/+15
|\ \ \ \ | | |/ / | |/| |
| * | | Slight rewording of output messages.Diva Canto2012-04-241-1/+1
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-242-1/+13
| |\ \ \
| | * \ \ Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-04-251-0/+1
| | |\ \ \
| | | * | | zero out SP velocity before calling SP.Teleport(), as the client expects (tho...Justin Clark-Casey (justincc)2012-04-251-0/+1
| | * | | | Commit the avination Teleport() methods (adaptedto justincc's changes)Melanie2012-04-251-1/+12
| | |/ / /
| * | | | HG: Moved User-level code down to the HGEntityTransferModule where it belongs.Diva Canto2012-04-242-14/+14
| |/ / /
* | | | Merge branch 'master' into careminsterMelanie2012-04-255-11/+40
|\ \ \ \ | |/ / /
| * | | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()Justin Clark-Casey (justincc)2012-04-252-17/+1
| * | | Add regression test TestSameRegionTeleport()Justin Clark-Casey (justincc)2012-04-253-1/+43
| * | | Comment out AvatarService.SetAvatar debug log line for nowJustin Clark-Casey (justincc)2012-04-251-1/+1
* | | | Merge branch 'master' into careminsterMelanie2012-04-258-55/+76
|\ \ \ \ | |/ / /
| * | | Comment out some debug ATTACHMENTS log messages for now.Justin Clark-Casey (justincc)2012-04-251-15/+14
| * | | Comment out the noisier AVFACTORY log messages for now.Justin Clark-Casey (justincc)2012-04-251-4/+6
| * | | Improve teleport log debug and error messages to tell us who is teleporting.Justin Clark-Casey (justincc)2012-04-251-3/+14
| * | | Go back to always using the local timezone for now - not all machines have US...Justin Clark-Casey (justincc)2012-04-241-13/+18
| * | | Revert "Refactored how asset/inventory types are associated with content type...Justin Clark-Casey (justincc)2012-04-242-177/+228
| * | | Minor improvements to loggingOren Hurvitz2012-04-246-12/+24
| * | | Refactored how asset/inventory types are associated with content types: gathe...Oren Hurvitz2012-04-242-228/+177
* | | | Merge branch 'master' into careminsterMelanie2012-04-2415-355/+298
|\ \ \ \ | |/ / /
| * | | Fixed problem with MySQL: it was possible for one thread to use an incomplete...Oren Hurvitz2012-04-243-21/+37
| * | | When reading a region, use null objects to represent NULL fields.Oren Hurvitz2012-04-241-1/+5
| * | | OSSL: fixed the threat level check for osParseJSONNewOren Hurvitz2012-04-241-1/+1
| * | | minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), chief...Justin Clark-Casey (justincc)2012-04-241-1/+6
| * | | DST settings to match client default Pacific Time (mantis #5972)Olivier van Helden and Gudule Lapointe (Speculoos.net)2012-04-241-1/+15
| * | | Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ...Justin Clark-Casey (justincc)2012-04-241-0/+1
| * | | Changed the Map-related messages from Info to Debug. They're debug messages.Diva Canto2012-04-234-8/+8
| * | | Add online/offline indicator to "friends show" region console command.Justin Clark-Casey (justincc)2012-04-241-3/+14
| * | | Add osForceAttachToAvatar() and osForceDetachFromAvatar()Justin Clark-Casey (justincc)2012-04-246-49/+127
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-236-58/+120
| |\ \ \
| * | | | Replace common code to fetch self inventory item (as opposed to uuid) with Ge...Justin Clark-Casey (justincc)2012-04-231-155/+76