| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-15 | 1 | -6/+13 | |
| |\ \ \ | |/ / |/| / | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-13 | 3 | -3/+37 | |
| | |\ | ||||||
| | * | | On object deserialization, go back to logging errors at DEBUG level rather ↵ | Justin Clark-Casey (justincc) | 2012-02-13 | 1 | -6/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -3/+3 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Change parser to leave embedded quotes alone if the pattern is recognized | Melanie | 2012-02-10 | 1 | -0/+34 | |
| | | | | | | | | | | | | | as an OptionSet long option | |||||
| | * | | minor: Remove warning from RegionInfo due to repeated config.GetString() ↵ | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -1/+0 | |
| | | | | | | | | | | | | | call where the first was unused. | |||||
| | * | | Add line numbers to Util.PrintCallStack() | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -2/+3 | |
| | |/ | ||||||
| * | | Change parser to leave embedded quotes alone if the pattern is recognized | Melanie | 2012-02-10 | 1 | -0/+34 | |
| | | | | | | | | | as an OptionSet long option | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-05 | 1 | -2/+2 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | Set PhysPrimMax default to 0 so ini files won't be overridden | BlueWall | 2012-02-04 | 1 | -1/+1 | |
| | | | ||||||
| | * | Make NonphysicalPrimMax setting work properly | BlueWall | 2012-02-04 | 1 | -1/+1 | |
| | | | | | | | | | RegionInfo setting will override only if it is > 0 | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 9 | -111/+370 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||||
| | * | Add TestRegionSettingsDeserialize | Justin Clark-Casey (justincc) | 2012-02-04 | 2 | -1/+135 | |
| | | | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-02-03 | 3 | -4/+12 | |
| | |\ | ||||||
| | | * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-02-04 | 8 | -109/+215 | |
| | | |\ | ||||||
| | | | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-03 | 2 | -2/+10 | |
| | | | |\ | ||||||
| | | | | * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 2 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | | * | | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ↵ | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 | |
| | | | |/ | | |/| | | | | | | | | | corresponding RemoteAdmin parameter | |||||
| | * | | | Change SceneObjectSerializer to use common ↵ | Justin Clark-Casey (justincc) | 2012-02-03 | 1 | -9/+28 | |
| | | |/ | |/| | | | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging. | |||||
| | * | | 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. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-03 | 1 | -18/+23 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-02 | 6 | -21/+42 | |
| | |\ | ||||||
| | * | | fix line endings | Dan Lake | 2012-02-02 | 1 | -7/+7 | |
| | | | | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-01 | 9 | -167/+251 | |
| | |\ \ | ||||||
| | * | | | 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 | 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 | 5 | -21/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts) | |||||
| * | | | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 5 | -21/+30 | |
| | | | | | ||||||
| * | | | | 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 | 1 | -0/+11 | |
| | | |/ | |/| | | | | | | | 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 | 1 | -2/+12 | |
| | | | | | | | | | | | | | and loading scenarios which resulted in loss of continuity on item ids | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-31 | 1 | -1/+1 | |
| |\ \ \ | |/ / | ||||||
| | * | | Use Environment.TickCount & Int32.MaxValue; instead of ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound. This matches the tickcount masking in the thread watchdog. For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 1 | -0/+8 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs | |||||
| | * | | Add ParcelImageID to RegionSettings so we can have that overlay. | Melanie | 2012-01-30 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 1 | -2/+2 | |
| |\ \ \ | |/ / | ||||||
| | * | | Remove IClientAPI from the money module. It was only used to pass in the | Melanie | 2012-01-28 | 1 | -2/+2 | |
| | | | | | | | | | | | | | agent id anyway | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 1 | -0/+6 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Framework/EstateSettings.cs | |||||
| | * | | llManageEstateAccess implementation ↵ | PixelTomsen | 2012-01-26 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlManageEstateAccess Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 1 | -0/+6 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | llGetParcelMusicURL implementation ↵ | Pixel Tomsen | 2012-01-25 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 1 | -123/+125 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||||
| | * | | Comment out asset statistics section from periodic stats as these have not ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -108/+109 | |
| | | | | | | | | | | | | | | | | | | | | | | been recorded for a very long time. Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness. Some data is available via other means (e.g. "fcache status"). | |||||
| | * | | Comment out inventory statistics section from periodic stats, since this ↵ | Justin Clark-Casey (justincc) | 2012-01-24 | 1 | -14/+15 | |
| | | | | | | | | | | | | | only contained the now uncollected and irrelevant inventory cache number. | |||||
| | * | | Simplify and streamline telehub editing code. Verify rotations and fix | Melanie | 2012-01-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | spwan point positioning on rotated telehubs. | |||||
| | * | | Reverse the spawn point distance vector | Melanie | 2012-01-24 | 1 | -3/+3 | |
| | | | | ||||||
| | * | | Correct a coordinate to make the viewer like it | Melanie | 2012-01-24 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Simplify and streamline telehub editing code. Verify rotations and fix | Melanie | 2012-01-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | spwan point positioning on rotated telehubs. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |