| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 32 | -254/+526 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | Add default value to TelehubObject | BlueWall | 2012-02-04 | 1 | -0/+10 |
| | | | |||||
| | * | Supply correct parameters to detailed authentication login fail message | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -1/+1 |
| | | | |||||
| | * | 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. | ||||
| | * | Add TestRegionSettingsDeserialize | Justin Clark-Casey (justincc) | 2012-02-04 | 2 | -1/+135 |
| | | | |||||
| | * | 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 | 19 | -37/+69 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-02-04 | 21 | -146/+278 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-03 | 13 | -17/+50 |
| | | | |\ | |||||
| | | | | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-03 | 13 | -17/+50 |
| | | | | |\ | |||||
| | | | | | * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 13 | -17/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -123/+223 |
| | | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | 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 | 5 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | corresponding RemoteAdmin parameter | ||||
| | * | | | | Change SceneObjectSerializer to use common ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 2 | -83/+57 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | Refactor common deserialization processor code to generic method ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 3 | -98/+62 |
| | | | | | | | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() | ||||
| | * | | | Change LandDataSerializer deserialization so that in the future it won't ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 5 | -75/+209 |
| | |/ / | | | | | | | | | | | | | | | | care about extra elements or element order. This brings it into line with other deserializations such as object and will improve future backward compatibility. | ||||
| | * | | Corrected console help texts for "save iar" | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 5 | -59/+121 |
| |\ \ \ | |/ / | |||||
| | * | | 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 | 23 | -138/+271 |
| | |\ | |||||
| | * | | ObjectAddedToScene event should be fired when duplicating objects | Dan Lake | 2012-02-02 | 2 | -20/+22 |
| | | | | |||||
| | * | | fix line endings | Dan Lake | 2012-02-02 | 1 | -7/+7 |
| | | | | |||||
| | * | | 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 | 122 | -1528/+5634 |
| | |\ \ | |||||
| | * | | | 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 |
| | | | | | |||||
| | * | | | Fixed bugs in earlier commit on custom user parameters in Regions.ini | Dan Lake | 2012-01-19 | 1 | -20/+25 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 3 | -15/+44 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-03 | 3 | -15/+44 |
| | |\ \ \ | |||||
| | | * | | | 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 | ||||
| | | * | | | Add stress tests for simple object add of 100 prim objects. Add time taken ↵ | Justin Clark-Casey (justincc) | 2012-02-02 | 1 | -14/+37 |
| | | | | | | | | | | | | | | | | | | | | | to output (this is unreliable). | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 1 | -0/+1 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Fix test failure | Melanie | 2012-02-03 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 16 | -108/+197 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts) | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-02-02 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | OpenID: server connector had a copy-and-paste error that made identity ↵ | Diva Canto | 2012-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | queries fail. | ||||
| * | | | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 15 | -109/+188 |
| | | | | | |||||
| * | | | | 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. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-02-02 | 1 | -3/+3 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| | * | | | Improve reliability of script state saving by covering various saving | Melanie | 2012-02-02 | 3 | -14/+28 |
| | | |/ | |/| | | | | | | | and loading scenarios which resulted in loss of continuity on item ids | ||||
| * | | | Improve reliability of script state saving by covering various saving | Melanie | 2012-02-02 | 3 | -15/+28 |
| | | | | | | | | | | | | | 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 |
| | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |