aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing ↵Justin Clark-Casey (justincc)2012-04-261-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | analysis complexity
| * | | | | | 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
| | |_|/ / / | |/| | | |
| * | | | | 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 ↵Melanie2012-04-252-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | scripts work. Fixes Mantis #5990
| * | | | | Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-252-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folder when deleting objects from a scene. The use of the trash folder causes assets to be created and stored everytime you delete an object from the scene (slows down the delete and adds mostly useless assets to your database). Default is on (use the trash folder) which is the standard behavior.
* | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-272-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | careminster
| * | | | Help big boobies to dance (avatar visualParams). May not persist and need ↵UbitUmarov2012-04-262-2/+2
| | | | | | | | | | | | | | | | | | | | 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-251-15/+24
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-2539-769/+1283
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | 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-254-10/+39
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 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
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-04-255-41/+50
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | 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
| | | | |
| * | | | Minor improvements to loggingOren Hurvitz2012-04-244-11/+16
| | | | | | | | | | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
* | | | | Merge branch 'master' into careminsterMelanie2012-04-2411-332/+236
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | OSSL: fixed the threat level check for osParseJSONNewOren Hurvitz2012-04-241-1/+1
| | | | |
| * | | | 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.
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-235-58/+100
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Replace common code to fetch self inventory item (as opposed to uuid) with ↵Justin Clark-Casey (justincc)2012-04-231-155/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetSelfInventoryItem() However, at some point it would be far more convenient to receive the TaskInventoryItem in the constructor rather than just the item UUID, so we don't have to constantly refetch our self item.
| * | | | refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_ApiJustin Clark-Casey (justincc)2012-04-231-94/+42
| | | | | | | | | | | | | | | | | | | | There's no point look up an item ID that we already have.
* | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-237-502/+617
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | careminster