aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-1517-361/+906
|\
| * Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-143-15/+38
| |
| * Fix a race condition in the simian groups connector. When requests wereMic Bowman2012-02-131-8/+63
| | | | | | | | | | | | too slow they would circumvent the cache (piling up on the network service and making the problem even worse). This condition happens frequently during permission checks.
| * Fix: get embedded objects from Notecard fails with activated ↵PixelTomsen2012-02-141-3/+3
| | | | | | | | | | | | FreeSwitchVoiceModul http://opensimulator.org/mantis/view.php?id=2607
| * Fix: Lightshare Module(Windlight)-Region settings are not applicable for ↵PixelTomsen2012-02-144-307/+692
| | | | | | | | database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888
| * Fix: MSSQLDB Grid - unable to register region ↵PixelTomsen2012-02-141-1/+8
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5886
| * Revert "Add GridStore migration for MSSQL."Justin Clark-Casey (justincc)2012-02-141-8/+0
| | | | | | | | This reverts commit 0b17a66e683f7ffca3877c1601c4179684b62144.
| * Add GridStore migration for MSSQL.Justin Clark-Casey (justincc)2012-02-141-0/+8
| | | | | | | | This is done blind since I don't use MSSQL. If this doesn't work, then one will have to wait for it to be updated for the 0.7.3 opensim release.
| * Add some more data to the new user connection logging for debug purposes.Justin Clark-Casey (justincc)2012-02-141-3/+3
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-141-1/+6
| |\
| | * short circuit the expensive parts of the permission checking codeMic Bowman2012-02-131-1/+6
| | | | | | | | | | | | | | | if the current user is the owner of an object. none of the later checks can reverse the outcome.
| * | Update [XEngine] AppDomainLoading advice in OpenSim.ini.exampleJustin Clark-Casey (justincc)2012-02-141-4/+9
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-1311-23/+143
| |\
| | * correct the default avatar_terminal_velocity value that I accidentally left ↵Justin Clark-Casey (justincc)2012-02-111-1/+1
| | | | | | | | | | | | in whilst testing
| | * Clamp ODE character velocity. Make ODE falling character 54m/s by default.Justin Clark-Casey (justincc)2012-02-113-1/+58
| | | | | | | | | | | | | | | | | | | | | If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value. In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver. This also appears to be the value used on the linden lab grid. This should resolve http://opensimulator.org/mantis/view.php?id=5882
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-111-0/+34
| | |\
| | * | Make ScenePresence.MovementFlag a private only settable value to reduce ↵Justin Clark-Casey (justincc)2012-02-111-7/+4
| | | | | | | | | | | | | | | | complexity of code analysis
| * | | On object deserialization, go back to logging errors at DEBUG level rather ↵Justin Clark-Casey (justincc)2012-02-132-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than ERROR. Restore extra log message if shape processing fails. Logging level was DEBUG before 312e145 (Fri Feb 3 2012). 312e145 also accidentally removed the 'general error' log message if any shape deserialization failed. This commit restores it, though this has no functional impact.
* | | | Merge branch 'master' into careminsterMelanie2012-02-106-15/+47
|\ \ \ \ | | |_|/ | |/| |
| * | | Change parser to leave embedded quotes alone if the pattern is recognizedMelanie2012-02-101-0/+34
| | |/ | |/| | | | | | | as an OptionSet long option
| * | minor: Remove warning from RegionInfo due to repeated config.GetString() ↵Justin Clark-Casey (justincc)2012-02-101-1/+0
| | | | | | | | | | | | call where the first was unused.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-101-0/+12
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-101-9/+20
| | |\ \
| | * \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-02-102-3/+12
| | |\ \ \
| | * | | | Fix: Covenant view fails after updates or cache-clean see mantis ↵PixelTomsen2012-02-101-0/+12
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=2879 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | | | Add line numbers to Util.PrintCallStack()Justin Clark-Casey (justincc)2012-02-101-2/+3
| | |_|/ | |/| |
| * | | Fix an npc delete race condition with LSL sensors where an initial presence ↵Justin Clark-Casey (justincc)2012-02-101-9/+20
| | |/ | |/| | | | | | | | | | | | | | | | check could succeed but then the npc removed before the subequent npc check. The resulting null would cause an exception. We now check for null before looking at SenseAsAgent. Hopefully fixes http://opensimulator.org/mantis/view.php?id=5872
| * | Fix bug where somebody taking a copy of an object they didn't own that was ↵Justin Clark-Casey (justincc)2012-02-102-3/+12
| |/ | | | | | | | | | | rezzed before the region was restarted would wrongly place the copy in the object owner's inventory. Addresses http://opensimulator.org/mantis/view.php?id=5825
* | Change parser to leave embedded quotes alone if the pattern is recognizedMelanie2012-02-101-0/+34
| | | | | | | | as an OptionSet long option
* | Merge branch 'master' into careminsterMelanie2012-02-1013-20/+244
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * Fix: Unable to remove AV from friend list (sqldb-bug) ↵PixelTomsen2012-02-102-8/+8
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3731
| * When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵Justin Clark-Casey (justincc)2012-02-106-11/+40
| | | | | | | | | | | | | | | | permissions, not PermissionMask.All Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set. This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is). Should resolve http://opensimulator.org/mantis/view.php?id=5651
| * Fix another Torture test build break on Windows.Justin Clark-Casey (justincc)2012-02-091-0/+1
| |
| * If NPCModule.CreateNPC() fails to create the required ScenePresence (which ↵Justin Clark-Casey (justincc)2012-02-092-9/+8
| | | | | | | | should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
| * Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.Justin Clark-Casey (justincc)2012-02-092-0/+188
| |
* | Merge branch 'master' into careminsterMelanie2012-02-098-14/+70
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * minor: put in commented out logging statements for future reuseJustin Clark-Casey (justincc)2012-02-092-1/+10
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-081-0/+1
| |\
| | * Add missing reference to prebuild.xml for torture testsRobert Adams2012-02-071-0/+1
| | |
| * | Stop a scene object from attempting to link with itself (which results in an ↵Justin Clark-Casey (justincc)2012-02-084-10/+54
| |/ | | | | | | | | | | exception and constant complaints in v3 viewers). Aims to address http://opensimulator.org/mantis/view.php?id=5878
| * Make WebStats logging report consistently as WEB STATS MODULE instead of VC, ↵Justin Clark-Casey (justincc)2012-02-071-6/+5
| | | | | | | | VS and WEBSTATS
* | Push more NPC stuff into threadsMelanie2012-02-082-23/+40
| |
* | Merge branch 'master' into careminsterMelanie2012-02-0714-111/+145
|\ \ | |/
| * Set UseMeshiesPhysicsMesh = true in [Mesh] by defaultJustin Clark-Casey (justincc)2012-02-071-4/+3
| | | | | | | | This means that uploaded meshes will get a physics (collision) mesh if uploaded with that option via a viewer.
| * Add start GC memory and end GC memory to object stress test printouts.Justin Clark-Casey (justincc)2012-02-074-4/+22
| | | | | | | | | | This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general). This means even the current stress tests take much more memory than they need, a problem that will have to be addressed.
| * Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ↵Justin Clark-Casey (justincc)2012-02-079-103/+120
| | | | | | | | exception in service connectors
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-0714-46/+336
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-0714-46/+336
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| | * Add TestAddTaskInventoryItem()Justin Clark-Casey (justincc)2012-02-072-4/+34
| | |
| | * Add warning about only uncommenting EstateConnectionString if you know what ↵Justin Clark-Casey (justincc)2012-02-071-0/+2
| | | | | | | | | | | | you're doing to GridCommon.ini.example (was already in StandaloneCommon.ini.example)