| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | delay terrain sending if land queue is 2 busy | UbitUmarov | 2015-08-22 | 2 | -0/+10 |
| | | |||||
| * | Merge branch 'mbworkvar2' into ubitvar | UbitUmarov | 2015-08-19 | 7 | -38/+14 |
| |\ | |||||
| | * | varregion: any conversions of use of Constants.RegionSize converted into | Robert Adams | 2015-03-29 | 6 | -6/+13 |
| | | | | | | | | | Util.cs routines to convert region coords to and from world coords or handles. | ||||
| | * | Varregion: first cut at removing Border class checks for region crossings. | Robert Adams | 2015-03-22 | 1 | -32/+1 |
| | | | | | | | | | | | Added Scene.PositionIsInCurrentRegion(pos) to sense when new position needs some crossing work. Many changes made to EntityTransferModule to accomodate new crossing sense logic. | ||||
| * | | Track selected objects per client | Melanie Thielker | 2015-08-15 | 2 | -0/+4 |
| | | | |||||
| * | | Comment spammy XMLRPC router message - we don't need to know every time a | Melanie Thielker | 2015-03-25 | 1 | -1/+1 |
| |/ | | | | script does something that wil fail anyway. | ||||
| * | Remove braindead "fix" that messed up intersim scripted giving. | Melanie Thielker | 2014-11-21 | 1 | -0/+17 |
| | | |||||
| * | scale ChildAgentThrottles with distance (internal to child server and not | UbitUmarov | 2014-11-06 | 2 | -0/+10 |
| | | | | | root as was done before ) | ||||
| * | Merge branch 'avination-current' | Melanie Thielker | 2014-10-30 | 1 | -0/+4 |
| |\ | |||||
| | * | Fix a potential nullref in Vivox | Melanie Thielker | 2014-10-30 | 1 | -0/+4 |
| | | | |||||
| * | | Add a sample use for the validation | Melanie Thielker | 2014-09-25 | 1 | -1/+2 |
| | | | |||||
| * | | add method to get a category throttle rate | UbitUmarov | 2014-08-29 | 2 | -0/+10 |
| | | | |||||
| * | | add a direct sendpartfullUpdate to send a full object update to a part, | UbitUmarov | 2014-08-21 | 2 | -0/+7 |
| | | | | | | | | | optionally overriding its parentID. check what it does to attachments | ||||
| * | | add a estimator of client ping time, and painfully make it visible in show | UbitUmarov | 2014-08-14 | 2 | -0/+4 |
| | | | | | | | | | connections console command | ||||
| * | | change XMLIrpgGroups attach to events, using the more correct | UbitUmarov | 2014-08-12 | 1 | -7/+24 |
| | | | | | | | | | \addons\Groups\... model | ||||
| * | | dont fire a thread on npc creation keeping the main one just waiting | UbitUmarov | 2014-08-02 | 1 | -5/+6 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 25 | -530/+1967 |
| |\ \ | |/ |/| | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 6 | -681/+883 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | ||||
| | | * | Re-enabled NPCModuleTests.TestCreate() | Justin Clark-Casey (justincc) | 2014-01-27 | 1 | -3/+1 |
| | | | | |||||
| | | * | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -21/+19 |
| | | |\ | |||||
| | | | * | minor: remove long unused state queue from "show queues" console reports | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -5/+3 |
| | | | | | |||||
| | | | * | minor: correct the usage statement on the "show image queues" console ↵ | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | command - should not have been "image queues show" | ||||
| | | | * | Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) ↵ | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | from the "show queues" console report to stop screwing up formatting. "show pquques" already did this | ||||
| | | * | | rather than converting existing materials to assets, just retrieve them and ↵ | dahlia | 2014-01-20 | 1 | -32/+12 |
| | | | | | | | | | | | | | | | | | make them available for viewing. Any new materials added to the scene will become assets. | ||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | dahlia | 2014-01-20 | 3 | -3/+274 |
| | | |\ \ | |||||
| | | | * | | Clean up orphaned json stores. This can happen when an object is | Mic Bowman | 2014-01-20 | 3 | -3/+274 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed, when a script is removed, or when a script is reset. Also added a stats command to track the number of json stores used by a region. Will probably add some more commands later. | ||||
| | | * | | | add null texture entry face check before converting legacy materials | dahlia | 2014-01-20 | 1 | -2/+2 |
| | | |/ / | |||||
| | | * | | force SOG update when converting legacy materials to ensure changes are ↵ | dahlia | 2014-01-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | persisted | ||||
| | | * | | delay texture entry parsing until absolutely necessary while converting ↵ | dahlia | 2014-01-20 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | legacy materials | ||||
| | | * | | Add code to convert legacy materials stored in DynAttrs to new asset format ↵ | dahlia | 2014-01-20 | 1 | -20/+102 |
| | | | | | | | | | | | | | | | | | and store them as assets | ||||
| | | * | | Check agent permissions before modifying an object's materials. Also, when ↵ | Oren Hurvitz | 2014-01-20 | 1 | -10/+21 |
| | | | | | | | | | | | | | | | | | creating a Material asset, set the current agent as the Creator. | ||||
| | | * | | When asked to change the Material for one face, change only that face; not ↵ | Oren Hurvitz | 2014-01-20 | 1 | -18/+5 |
| | | | | | | | | | | | | | | | | | the default material | ||||
| | | * | | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵ | Oren Hurvitz | 2014-01-20 | 1 | -327/+191 |
| | | | | | | | | | | | | | | | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'. | ||||
| | | * | | Renamed MaterialsDemoModule to MaterialsModule | Oren Hurvitz | 2014-01-20 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | - Materials: support the viewer removing the material (in which case ↵ | Oren Hurvitz | 2014-01-20 | 1 | -35/+42 |
| | | | | | | | | | | | | | | | | | matsMap["Material"] is missing) - Reduced logging | ||||
| | * | | | Intermediate commit. Sill errors. | Melanie | 2014-01-05 | 3 | -15/+74 |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs | ||||
| | | * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-19 | 1 | -3/+62 |
| | | |\ \ | | | |/ | |||||
| | | | * | Create regression test TestSendAgentGroupDataUpdate() for groups agent data ↵ | Justin Clark-Casey (justincc) | 2013-12-18 | 1 | -3/+62 |
| | | | | | | | | | | | | | | | | | sending | ||||
| | | * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -3/+5 |
| | | |\ \ | | | |/ | |||||
| | | | * | After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console rather than log as warning The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems. Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented | ||||
| | | * | | Comment out sit position checks in TestSitAndStandWithSitTarget() in SP and ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | NPC tests until positions are known to be stable. Also resolve issues with NoSitTarget() tests where I was trying to use a destroyed PhysActor | ||||
| | | * | | Fix TestSitAndStandWithNoSitTarget NPC and SP tests. | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | | | | These stopped working because current code calculates sit heights based on avatar physics rather than appearance data. Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests | ||||
| | | * | | Committing the Avination Scene Presence and related texture code | Melanie | 2013-12-11 | 2 | -1/+3 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-12-07 | 1 | -2/+4 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | | * | Change the log level for the LOGIN DISABLED and LOGIN ENABLED messages is | Mic Bowman | 2013-11-27 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | the RegionReady module to be warn so that the message will show up in the log for simulators running in a more production mode (knowing when logins are functional is useful). | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-11-23 | 4 | -11/+9 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat | ||||
| | | * | refactor: replace verbose checks with String.IsNullOrEmpty where applicable. | Justin Clark-Casey (justincc) | 2013-11-15 | 4 | -11/+9 |
| | | | | | | | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845 | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-11-03 | 1 | -50/+122 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | | * | Added support for attachments to group notices when using Flotsam groups. | Kevin Cozens | 2013-10-15 | 1 | -50/+122 |
| | | | | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-10-06 | 2 | -7/+22 |
| | |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |