aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-2769-666/+821
|\
| * 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-2633-383/+506
| | |\ \
| | * | | 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-253-1/+10
| |/ /
| * | 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
* | | | 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-273-5/+51
| |/ / |/| |
* | | 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
|/ / /
* | | 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
* | | 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
* | | 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
|\ \ \ | | |/ | |/|
| * | Mantis 5977 Corrections to llRegionSayToTalun2012-04-236-58/+120