| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-02-15 | 2 | -52/+176 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | careminster | |||||
| | * | | | | Implement region crossing of sitting avatars. Edit mode and llSetPos work | Melanie | 2012-02-14 | 2 | -54/+174 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet. | |||||
| | * | | | | Prevent object loss and positioning outside the region with failed object sim | Melanie | 2012-02-14 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | crossings | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-15 | 3 | -15/+16 | |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||||
| | * | | | Add some more data to the new user connection logging for debug purposes. | Justin Clark-Casey (justincc) | 2012-02-14 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-13 | 2 | -8/+6 | |
| | |\ \ \ | ||||||
| | | * | | | Make ScenePresence.MovementFlag a private only settable value to reduce ↵ | Justin Clark-Casey (justincc) | 2012-02-11 | 1 | -7/+4 | |
| | | | | | | | | | | | | | | | | | | | | | complexity of code analysis | |||||
| | * | | | | On object deserialization, go back to logging errors at DEBUG level rather ↵ | Justin Clark-Casey (justincc) | 2012-02-13 | 1 | -5/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 careminster | Melanie | 2012-02-10 | 1 | -1/+2 | |
| |\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | ||||||
| | * | | | Fix bug where somebody taking a copy of an object they didn't own that was ↵ | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -1/+2 | |
| | |/ / | | | | | | | | | | | | | | | | 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 | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 2 | -0/+11 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||||
| | * | | When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵ | Justin Clark-Casey (justincc) | 2012-02-10 | 2 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-09 | 4 | -7/+54 | |
| |\ \ \ | |/ / | | / | |/ |/| | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||||
| | * | 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 | |||||
| * | | 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' into careminster | Melanie | 2012-02-07 | 3 | -14/+32 | |
| |\ \ | |/ | | | | | | | | | 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 | 1 | -8/+4 | |
| | | | | | | | | | | | | | | | | | 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. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-05 | 2 | -5/+4 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | 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. | |||||
| | * | 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 | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 5 | -88/+57 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||||
| | * | 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 | 1 | -8/+7 | |
| | |\ | ||||||
| | | * | Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before ↵ | Dan Lake | 2012-02-03 | 1 | -4/+7 | |
| | | | | | | | | | | | | | triggering events on a potentially null Scene | |||||
| | * | | 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. | |||||
| * | | | 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 | 2 | -14/+17 | |
| | |\ | ||||||
| | | * | Improve reliability of script state saving by covering various saving | Melanie | 2012-02-02 | 2 | -14/+17 | |
| | | | | | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids | |||||
| | * | | 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 | 10 | -347/+575 | |
| | |\ \ | | |/ | ||||||
| | * | | Trigger event when prims are scheduled for an update. This gives modules ↵ | Dan Lake | 2012-01-19 | 2 | -0/+28 | |
| | | | | | | | | | | | | | early access to changed parameters. | |||||
| | * | | Cleaned up Color and Text parameters in SOP and made LocalFlags public for ↵ | Dan Lake | 2012-01-19 | 1 | -20/+6 | |
| | | | | | | | | | | | | | module access. | |||||
| | * | | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localID | Dan Lake | 2012-01-19 | 2 | -1/+12 | |
| | | | | ||||||
| * | | | Streamline banning code using existing methods. | Melanie | 2012-02-02 | 1 | -3/+13 | |
| | | | | ||||||
| * | | | Fix remembering attachment point and position when an item is rezzed in world. | Melanie | 2012-02-02 | 1 | -1/+19 | |
| | | | | | | | | | | | | | | | | Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script in the root. | |||||
| * | | | Improve reliability of script state saving by covering various saving | Melanie | 2012-02-02 | 2 | -13/+16 | |
| | | | | | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 2 | -6/+22 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||||
| | * | | Small optimization to last commit | Melanie | 2012-02-01 | 1 | -5/+5 | |
| | | | | ||||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-01 | 1 | -0/+6 | |
| | |\ \ | ||||||
| | | * | | Implement "show object uuid <uuid>" console command. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | This will show details about a part with the given uuid if it's found. | |||||
| | * | | | Fix copy/paste errors | Melanie | 2012-02-01 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Straighten out some attachment mess. Don't save attachment states for HG | Melanie | 2012-02-01 | 1 | -1/+11 | |
| | |/ / | | | | | | | | | | | | | visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-31 | 1 | -104/+0 | |
| |\ \ \ | |/ / | ||||||
| | * | | Move object delete commands into a commands region module, in preparation ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -104/+0 | |
| | | | | | | | | | | | | | for adding similar show commands. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |