aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-275-22/+54
|\ | | | | | | careminster
| * 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 ↵UbitUmarov2012-04-264-17/+41
| | | | | | | | more lobe ?
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-257-53/+158
|\ \ | |/ | | | | careminster
| * 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
| | | | | | | | but for testing/debug
| * 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 ↵UbitUmarov2012-04-241-11/+64
| | | | | | | | acumulated in about 1second. Total Frame Time is not just 1/reported sim fps
* | Merge branch 'master' into careminsterMelanie2012-04-250-0/+0
|\ \
| * | Port Avination link order to make OpenSim behave like SL. Make Primstar ↵Melanie2012-04-252-7/+47
| | | | | | | | | | | | scripts work. Fixes Mantis #5990
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | with .NET 3.5 vs 4.0 differences. See http://opensimulator.org/mantis/view.php?id=5971
* | | | Adapt some TeleportWithMomentum callsMelanie2012-04-252-2/+2
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-04-253-19/+15
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | 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 ↵Justin Clark-Casey (justincc)2012-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | (though this is also effectively done by physics at the moment)
| | * | | | 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
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()Justin Clark-Casey (justincc)2012-04-252-17/+1
| | | | | | | | | | | | | | | | These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
| * | | 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
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | | 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
| | | | | | | | | | | | | | | | Permanently comment out warnings about ScenePresence not being found - this is entirely expected if the avatar has alraedy logged out or left the scene.
| * | | 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 ↵Justin Clark-Casey (justincc)2012-04-241-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | US/Pacific or Olsen Amercia/Los_Angeles and this introduces variability that the server operator cannot control Please see http://opensimulator.org/mantis/view.php?id=5972 soon for more comments.
| * | | Revert "Refactored how asset/inventory types are associated with content ↵Justin Clark-Casey (justincc)2012-04-242-177/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | types: gathered all the knowledge into a single class. Added the Mesh content type." This reverts commit d3a4d67a207976cd0d116bb9021f7dfc896784e8. Accidentally committed this when I didn't mean to yet.
| * | | Minor improvements to loggingOren Hurvitz2012-04-246-12/+24
| | | | | | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
| * | | Refactored how asset/inventory types are associated with content types: ↵Oren Hurvitz2012-04-242-228/+177
| | | | | | | | | | | | | | | | gathered all the knowledge into a single class. Added the Mesh content type.
* | | | Merge branch 'master' into careminsterMelanie2012-04-2415-355/+298
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | Fixed problem with MySQL: it was possible for one thread to use an ↵Oren Hurvitz2012-04-243-21/+37
| | | | | | | | | | | | | | | | incomplete list of column names if another thread was creating the list at the same time. Now this is thread-safe.
| * | | When reading a region, use null objects to represent NULL fields.Oren Hurvitz2012-04-241-1/+5
| | | | | | | | | | | | | | | | Previously NULL fields were converted to an empty string due to the use of ToString(). But if the field was an Int (e.g., "locZ"), then the subsequent attempt to convert an empty string to an int caused an exception. Now the field is null so we don't try to convert it, so there's no exception.
| * | | OSSL: fixed the threat level check for osParseJSONNewOren Hurvitz2012-04-241-1/+1
| | | |
| * | | minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), ↵Justin Clark-Casey (justincc)2012-04-241-1/+6
| | | | | | | | | | | | | | | | chiefly some break up of the long line.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from ODEPrim.SetGeom. This occurred in 7a574be3fd from Sat 21 Apr 2012. This should fix collision detection. Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988
| * | | 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
| | | | | | | | | | | | | | | | Improve output table formatting.
| * | | Add osForceAttachToAvatar() and osForceDetachFromAvatar()Justin Clark-Casey (justincc)2012-04-246-49/+127
| | | | | | | | | | | | | | | | | | | | | | | | These behave identically to llAttachToAvatar() and llDetachFromAvatar() except that they do not enforce the PERMISSION_ATTACH check Intended for use in completely controlled dedicated environments where these checks are more a UI hinderance than a help. Threat level high.
generated by cgit v1.1 at 2024-12-23 10:12:33 +0000