Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | If NPCModule.CreateNPC() fails to create the required ScenePresence (which ↵ | Justin Clark-Casey (justincc) | 2012-02-09 | 2 | -9/+8 | |
| | | | | | | | | | | | | should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-09 | 7 | -14/+69 | |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||||
| | * | minor: put in commented out logging statements for future reuse | Justin Clark-Casey (justincc) | 2012-02-09 | 2 | -1/+10 | |
| | | | ||||||
| | * | Stop a scene object from attempting to link with itself (which results in an ↵ | Justin Clark-Casey (justincc) | 2012-02-08 | 4 | -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-07 | 1 | -6/+5 | |
| | | | | | | | | | | | | VS and WEBSTATS | |||||
* | | | Changes to vehicles code etc. Includes some debug aids to remove later. | UbitUmarov | 2012-02-10 | 4 | -243/+145 | |
| | | | ||||||
* | | | initial introdution of physics actor building control. | UbitUmarov | 2012-02-08 | 5 | -11/+60 | |
| | | | ||||||
* | | | first change in SOP. in AddPrimShape(..) give physics the world rotation and ↵ | UbitUmarov | 2012-02-08 | 1 | -2/+4 | |
| | | | | | | | | | | | | not local offset. Currently physics interface only knows about world frame | |||||
* | | | changes in physics manager, needed for UbitODE | UbitUmarov | 2012-02-08 | 2 | -1/+28 | |
| | | | ||||||
* | | | UbitODE plugin initial commit | UbitUmarov | 2012-02-08 | 10 | -0/+11556 | |
|/ / | ||||||
* | | Push more NPC stuff into threads | Melanie | 2012-02-08 | 2 | -23/+40 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 1 | -1/+2 | |
|\ \ | |/ | ||||||
| * | Add start GC memory and end GC memory to object stress test printouts. | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -1/+2 | |
| | | | | | | | | | | 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. | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-07 | 8 | -39/+145 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 8 | -39/+145 | |
| |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||||
| | * | Add TestAddTaskInventoryItem() | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -1/+25 | |
| | | | ||||||
| | * | Remove debug logging if physics actor is null in SOP.ApplyPhysics() | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -5/+1 | |
| | | | | | | | | | | | | This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor). | |||||
| | * | Add a regression test to compile and start a script. Remove ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 6 | -34/+117 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory. Later path concatenation is already done by Path.Combine() which handles any trailing slash. Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory. | |||||
* | | | Experimental. Expand Fire & Forget for NPC delete | Melanie | 2012-02-06 | 1 | -7/+7 | |
|/ / | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-05 | 4 | -8/+8 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | Revert my two quick fixes for the lag issue and put in the real fix, which | Melanie | 2012-02-05 | 1 | -1/+2 | |
| | | | | | | | | | | is to only write to the database if data was changed. I was writing to the db on every step of every avatar. Sure to give us lag, that. | |||||
| * | Revert "Remove checks on ban list expiry on every move. To be re-added on ↵ | Melanie | 2012-02-05 | 1 | -4/+4 | |
| | | | | | | | | | | | | parcel" This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56. | |||||
| * | Revert "Check ban list for a particular parcel only when an avatar moves ↵ | Melanie | 2012-02-05 | 2 | -17/+4 | |
| | | | | | | | | | | | | into it." This reverts commit 8923ad755d97d5ddb4a29cb6f543b53195f0b461. | |||||
| * | Make configuration uniform | BlueWall | 2012-02-05 | 1 | -3/+3 | |
| | | | | | | | | Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini. | |||||
| * | Check ban list for a particular parcel only when an avatar moves into it. | Melanie | 2012-02-05 | 2 | -4/+17 | |
| | | | | | | | | | | This restores functionality remove in the last commit without reintroducing the performance penalty. | |||||
| * | Remove checks on ban list expiry on every move. To be re-added on parcel | Melanie | 2012-02-05 | 1 | -4/+4 | |
| | | | | | | | | | | boundary crossing only as soon as I'm properly awake. This should fix recent performance issues | |||||
| * | change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make the | nebadon | 2012-02-04 | 1 | -1/+1 | |
| | | | | | | | | variable in OpenSim.ini and Regions.ini match | |||||
| * | Quiet the map module logging | BlueWall | 2012-02-04 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 14 | -131/+106 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||||
| * | Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would ↵ | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -0/+2 | |
| | | | | | | | | eventually be used by llCastRay(), though OpenSim does not use these yet. | |||||
| * | Correct RC_* LSL constants used by llCastRay(). | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -12/+12 | |
| | | | | | | | | Many thanks to WhiteStar for doing the research on this. | |||||
| * | Only look for an uploaded transactional asset in Scene.UpdateTaskInventory ↵ | Justin Clark-Casey (justincc) | 2012-02-04 | 3 | -22/+21 | |
| | | | | | | | | | | | | | | | | if we have been passed a non-zero transaction ID. This resolves the recent regression from deeb728 where notecards could not be saved in prim inventories. This looks like a better solution than deeb728 since only non-caps updates pass in a transaction ID. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5873 | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-03 | 8 | -22/+23 | |
| |\ | ||||||
| | * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-02-04 | 6 | -28/+31 | |
| | |\ | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-03 | 4 | -6/+8 | |
| | | |\ | ||||||
| | | | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-03 | 4 | -6/+8 | |
| | | | |\ | ||||||
| | | | | * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 4 | -6/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-03 | 2 | -16/+18 | |
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | | * | | | Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before ↵ | Dan Lake | 2012-02-03 | 1 | -4/+7 | |
| | | | |/ | | | |/| | | | | | | | | | | | triggering events on a potentially null Scene | |||||
| | * | | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵ | Snoopy Pfeffer | 2012-02-03 | 3 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | corresponding RemoteAdmin parameter | |||||
| * | | | | Change SceneObjectSerializer to use common ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 1 | -74/+29 | |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging. | |||||
| * | | | Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 1 | -14/+16 | |
| |/ / | | | | | | | | | | | | | | | | | | | | | | presence and population of m_avatars. This is required to stop a race where the SensorRepeat module can detect an NPC avatar before m_avatars is populated. Extending the lock is the easiest to understand solution rather than getting complicated with null checks. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5872 | |||||
| * | | Corrected console help texts for "save iar" | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 4 | -41/+98 | |
|\ \ \ | |/ / | ||||||
| * | | Commenting out new event until I can fix OpenSim tests. Currently, testing ↵ | Dan Lake | 2012-02-02 | 1 | -6/+6 | |
| | | | | | | | | | | | | objects does not create a Scene or EventManager so triggering events crashes some tests | |||||
| * | | OpenSim tests do not always create an EventManager so calls to trigger ↵ | Dan Lake | 2012-02-02 | 1 | -2/+6 | |
| |/ | | | | | | | events during tests must check for null EventManager | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-02 | 10 | -81/+163 | |
| |\ | ||||||
| * | | ObjectAddedToScene event should be fired when duplicating objects | Dan Lake | 2012-02-02 | 2 | -20/+22 | |
| | | | ||||||
| * | | Add event RegionHeartbeatEnd for modules interested in coordinating activity ↵ | Dan Lake | 2012-02-01 | 2 | -10/+36 | |
| | | | | | | | | | | | | with region heartbeats | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-01 | 87 | -979/+4406 | |
| |\ \ |