| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | |\ \ | |||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 2 | -1/+7 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-03 | 2 | -1/+7 |
| | |\ \ \ | |||||
| | | * | | | D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not ↵ | Justin Clark-Casey (justincc) | 2012-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | llGetLinkNumber(). | ||||
| | | * | | | Add llGetLinkNumberOfSides to LSL_Stub and ILSL_Api | Justin Clark-Casey (justincc) | 2012-02-02 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | It already existed in LSL_Api but it also needs to exist in these two other places for a script to be able to see it. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5489 | ||||
| | * | | | | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 6 | -66/+139 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts) | ||||
| | * | | | 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 | ||||
| * | | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 6 | -67/+136 |
| | | | | |||||
| * | | | Streamline banning code using existing methods. | Melanie | 2012-02-02 | 2 | -186/+42 |
| | | | | |||||
| * | | | Rehook the eject and freeze events that had gotten unhooked in the merge | Melanie | 2012-02-02 | 1 | -0/+2 |
| | | | | |||||
| * | | | Fix remembering attachment point and position when an item is rezzed in world. | Melanie | 2012-02-02 | 3 | -50/+81 |
| | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Re-Add the reading of attachment data hat was lost in the merge | Melanie | 2012-02-02 | 1 | -1/+46 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 7 | -43/+305 |
| |\ \ \ | |/ / | | | | | | | | | | 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 | 4 | -25/+279 |
| | |\ \ | |||||
| | | * | | HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like ↵ | Diva Canto | 2012-01-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Uri.ToString() drops the port when it's port 80. | ||||
| | | * | | Lay out script status in property per row format, since getting too long for ↵ | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -6/+12 |
| | | | | | | | | | | | | | | | | | console lines. | ||||
| | | * | | Add count of events queued for a particular script in "scripts show" console ↵ | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | command | ||||
| | | * | | Make script console commands only show for selected region. | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -0/+9 |
| | | | | | |||||
| | | * | | Implement "xengine status" console command to show various xengine stats | Justin Clark-Casey (justincc) | 2012-02-01 | 1 | -4/+28 |
| | | | | | |||||
| | | * | | Add "show part uuid" and "show part name" console commands. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -7/+97 |
| | | | | | | | | | | | | | | | | | | | | | | | | | These commands will display part/prim details for a given uuid or name The "show object uuid" and "show object name" commands will now only display details for objects (i.e. not child parts in a linkset). This is for consistency with the "delete object" commands which only delete objects, not parts. | ||||
| | | * | | Implement "show object name <name>" console command to show details of an ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -8/+49 |
| | | | | | | | | | | | | | | | | | object with the given name | ||||
| | | * | | Get rid of the "no objects found" feedback for now - this doesn't work well ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -11/+13 |
| | | | | | | | | | | | | | | | | | if a command is executed over multiple scenes. | ||||
| | | * | | Implement "show object uuid <uuid>" console command. | Justin Clark-Casey (justincc) | 2012-01-31 | 2 | -5/+62 |
| | | | | | | | | | | | | | | | | | This will show details about a part with the given uuid if it's found. | ||||
| | | * | | Add more user feedback if an object isn't found for which delete was requested. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -0/+15 |
| | | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |