aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-2711-45/+192
|\
| * Fixed: custom walking animations didn't stop when the avatar stopped walking.Oren Hurvitz2012-04-272-20/+32
| * If a Grid God teleports then include the Godlike teleport flag. This can affe...Oren Hurvitz2012-04-273-9/+45
| * Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-272-2/+8
| * minor: style adjustments in SensorRepeat, mainly related to patch from stoehrJustin Clark-Casey (justincc)2012-04-271-3/+4
| * Fixing wrong position of llSensor, SensePoint wasnt following the rotation of...Stefan_Boom2012-04-271-8/+22
| * MapImageService: changed the event at which the map tiles are uploaded, becau...Diva Canto2012-04-272-5/+14
| * MapImage security issue. Compare strings instead of IPAddresses.Diva Canto2012-04-271-1/+1
| * MapImage security issue: better error messagesDiva Canto2012-04-271-3/+5
| * Amend to last commit: account for the existence of proxies.Diva Canto2012-04-271-3/+32
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-2768-666/+814
| |\
| * | Minor change in error message (HG teleport failures)Diva Canto2012-04-271-1/+1
| * | MapImageService: added an additional security check for OSGrid and other grid...Diva Canto2012-04-271-5/+43
* | | Merge branch 'master' into careminsterMelanie2012-04-2764-639/+734
|\ \ \ | | |/ | |/|
| * | Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-2749-307/+268
| * | OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar.Oren Hurvitz2012-04-261-13/+12
| * | Refactored how asset/inventory types are associated with content types: gathe...Oren Hurvitz2012-04-262-228/+177
| * | When creating an OAR, objects where the user is the Creator are always includ...Oren Hurvitz2012-04-261-2/+7
| * | Tweak log messages on local region to region teleport path to help with probl...Justin Clark-Casey (justincc)2012-04-265-25/+48
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-266-10/+144
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-04-263-22/+43
| | |\ \
| | * \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-2632-383/+499
| | |\ \ \
| | * | | | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-266-10/+144
| * | | | | Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing ana...Justin Clark-Casey (justincc)2012-04-261-35/+35
| * | | | | minor: Add more detail to unauthorized caps client messageJustin Clark-Casey (justincc)2012-04-261-1/+4
| * | | | | minor: Add region name to dropped inbound packet messageJustin Clark-Casey (justincc)2012-04-261-1/+3
| | |_|/ / | |/| | |
| * | | | Add request verb and url to error messages in WebUtil that lack this.Justin Clark-Casey (justincc)2012-04-261-17/+38
| * | | | minor: Add avatar name to removing agent log messageJustin Clark-Casey (justincc)2012-04-261-2/+2
| * | | | Comment out avatar move to target message for now.Justin Clark-Casey (justincc)2012-04-251-3/+3
| | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-252-7/+47
| |\ \ \
| | * | | Port Avination link order to make OpenSim behave like SL. Make Primstar scrip...Melanie2012-04-252-7/+47
| * | | | Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-252-1/+3
| |/ / /
* | | | 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