| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-07 | 2 | -6/+29 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||||
| | * | Add TestAddTaskInventoryItem() | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -3/+9 | |
| | | | ||||||
| | * | Add a regression test to compile and start a script. Remove ↵ | Justin Clark-Casey (justincc) | 2012-02-07 | 1 | -3/+20 | |
| | | | | | | | | | | | | | | | | | 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-04 | 1 | -1/+1 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||||
| | * | Fix: Covenant changed time not set ↵ | PixelTomsen | 2012-02-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | * | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | 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 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 1 | -5/+19 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-20 | 1 | -0/+6 | |
| | |\ | ||||||
| | | * | Add image not in database test for LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -0/+6 | |
| | | | | ||||||
| | * | | Telehub Support: | BlueWall | 2012-01-20 | 1 | -0/+5 | |
| | |/ | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing. | |||||
| | * | Add basic request and send image regression tests for LLImageManager | Justin Clark-Casey (justincc) | 2012-01-19 | 1 | -5/+8 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -0/+1 | |
| |\ \ | |/ | ||||||
| | * | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -2/+5 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | On a new client circuit, send the initial reply ack to let the client know ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | it's live before sending other data. This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before. This may stop some avatars appearing grey on login. This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-06 | 1 | -0/+179 | |
| |\ \ | |/ | ||||||
| | * | Add test for not found response from GetTexture cap handler. | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -0/+179 | |
| | | | | | | | | | Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -15/+97 | |
| |\ \ | |/ | ||||||
| | * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -15/+97 | |
| | | | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -10/+28 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | Split up test SceneHelpers to provide an AddChildScenePresence() call | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -10/+25 | |
| | | | ||||||
| | * | Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -0/+3 | |
| | | | | | | | | | | | This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate. Normal standalone operation unaffected. | |||||
| * | | Implement ChangeInventoryItemFlagsPacket handling | Melanie | 2011-12-04 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -6/+9 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||||
| | * | Add test for removing a friendship. | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -6/+9 | |
| | | | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-14 | 1 | -2/+9 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||||
| | * | Add very simple FriendsModuleTests.TestNoFriends() | Justin Clark-Casey (justincc) | 2011-11-14 | 1 | -2/+9 | |
| | | | ||||||
| | * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -1/+1 | |
| | | | | | | | | | packet per prim. More to come as we change to make use of this. | |||||
| * | | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+14 | |
| |\ \ | |/ | ||||||
| | * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -3/+14 | |
| | | | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743 | |||||
| * | | Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge | Melanie | 2011-10-25 | 2 | -12/+19 | |
| |\ \ | |/ | ||||||
| | * | redirect UserInventoryHelpers to use a different CreateNotecardAsset() so we ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -12/+19 | |
| | | | | | | | | | can comment out some inconsistency | |||||
| * | | Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | correct misleading method doc on CreateNotecardAsset() | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 | |
| |\ \ | |/ | ||||||
| | * | in AssetHelpers, store the actual text passed in to the method, not the ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -2/+2 | |
| | | | | | | | | | string "data" | |||||
| * | | Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+6 | |
| |\ \ | |/ | ||||||
| | * | encode notecard assets in proper format for tests, rather than just using ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 1 | -1/+6 | |
| | | | | | | | | | whatever string is given | |||||
| * | | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+5 | |
| |\ \ | |/ | ||||||
| | * | refactor: rename some AssetHelpers.CreateAsset() methods to ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -5/+5 | |
| | | | | | | | | | CreateNotecardAsset() | |||||
| * | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+1 | |
| |\ \ | |/ | ||||||
| | * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -3/+1 | |
| | | | | | | | | | without a getter | |||||
| * | | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+5 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -5/+5 | |
| | | | | | | | | | the others | |||||
| * | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 2 | -3/+3 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | fetch physical_prim switch from [Startup] config from inside scene, as is ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 2 | -3/+3 | |
| | | | | | | | | | done for most other scene config params | |||||
| * | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵ | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -1/+1 | |
| | | | | | | | | | sends entity updates (including presence ones), not just prims. | |||||
| * | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |