ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-25 19:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,818 Commits 5 Branches 93 Tags
a79bafaaaf3df2a0e1663bf9317ee53eb06db204
Commit Graph

58 Commits

Author SHA1 Message Date
Melanie
90305001de Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-04-27 17:09:49 +01:00
Oren Hurvitz
0da8fe3124 Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type. 2012-04-26 22:49:14 +01:00
Melanie
74aa8eee12 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-04-17 01:54:54 +01:00
Justin Clark-Casey (justincc)
24a0cc5261 refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does. 
This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities.
As per opensim-dev mailing list.
 2012-04-17 01:25:41 +01:00
Melanie
5ab536a1e9 Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2011-12-05 17:10:51 +00:00
Justin Clark-Casey (justincc)
4919c60560 Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() 
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.
 2011-12-03 18:59:54 +00:00
Melanie
02f0aa592d Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge 2011-10-25 03:19:10 +01:00
Justin Clark-Casey (justincc)
ffdf59a57c Get UUIDGatherer to scan notecards in the graph for asset uuids. 
This is to support npc baked texture saving in oars and iars.
May address http://opensimulator.org/mantis/view.php?id=5743
 2011-10-22 02:16:46 +01:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
dad1d6df18 rename TestHelper => TestHelpers for consistency 2011-08-06 00:31:03 +01:00
Justin Clark-Casey (justincc)
b6ac1c46cd Get rid of AvatarAppearance.Owner to simplify the code. 
This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
 2011-08-02 00:13:04 +01:00
Melanie
be1996f121 Merge branch 'master' into careminster-presence-refactor 2011-05-22 20:23:25 +01:00
Justin Clark-Casey (justincc)
bb9b317f15 Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Tests.Common instead 2011-05-21 01:05:20 +01:00
Melanie
d1cf1fe3d7 Merge branch 'master' into careminster-presence-refactor 2011-04-30 14:37:37 +01:00
Diva Canto
9892e115cc Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service. 2011-04-28 20:19:54 -07:00
Melanie
9165a5207d Merge branch 'master' into careminster-presence-refactor 2011-03-10 07:14:03 +00:00
Justin Clark-Casey (justincc)
9456bb77fb Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately. 
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
 2011-03-09 23:25:24 +00:00
Tom
3ecf712e4d Add userFlags check to isBanned. This checks bans against DenyAnonymous and DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on . 2011-01-26 14:20:39 -08:00
Master ScienceSim
b1c8d05888 Major refactoring of appearance handling. 
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.

AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.

AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.

AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
 2010-10-20 16:17:54 -07:00
Justin Clark-Casey (justincc)
ed161020e2 minor: remove some mono compiler warnings 2010-10-09 01:46:29 +01:00
Teravus Ovares (Dan Olivares)
27d5976b87 * Tweaked the LocationTests for maximum coverage. 
* Added more mundane tests.
 2010-09-18 03:42:37 -04:00
Teravus Ovares (Dan Olivares)
c203fae26b * Covered the type converters in SLUtil with unit tests. 
* Does anyone have an example raw notecard to look at and test the notecard parser?
 2010-09-18 02:49:42 -04:00
Teravus Ovares (Dan Olivares)
4d83879704 * More Mundane Tests 
* SL Util tests of AssetType2ContentType and ContentType2AssetType
 2010-09-17 23:27:41 -04:00
Justin Clark-Casey (justincc)
4327c795f8 Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to OpenSim/Framework/Tests/PrimeNumberHelperTests.cs 
I'm assuming the lowercase tests was a mistake.  Please revert if it actually wasn't
 2010-09-18 00:25:22 +01:00
Teravus Ovares (Dan Olivares)
94f35890e7 * Fixed and re-enabled CacheTests 
* Added MundaneFrameworkTests.cs for the really mundane tests like testing properties,constructors, etc in OpenSim.Framework.
* Fixed LeftAxis and UpAxis unpacking from OSD to AgentPosition (copy and paste error caught while writing mundane test) (Good thing nobody uses the camera frustum from remote regions yet)
 2010-09-17 18:41:12 -04:00
Teravus Ovares (Dan Olivares)
69749b81f9 * Add a few more tests to help our meager code coverage %. 
* Tests Animation Constructors
* Tests Animation OSD Packing/Unpacking
* Tests the PrimeNumberHelper class which is used in the cache.
 2010-09-17 03:11:57 -04:00
Justin Clark-Casey (justincc)
f393e10ea4 remove unused ACL class 2010-07-30 19:34:55 +01:00
John Hurliman
df76e95aa2 Changed asset CreatorID to a string 2010-02-22 14:18:59 -08:00
John Hurliman
7665aad002 * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it 2010-02-22 13:27:17 -08:00
Justin Clark-Casey (justincc)
a4d2a97bc6 minor: remove some mono compiler warnings, add --merge load oar switch to help information 2009-11-25 16:14:08 +00:00
Jeff Ames
9f5c2acd12 Formatting cleanup. 2009-11-23 11:26:06 +09:00
John Hurliman
afef1ac191 Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen 2009-11-05 13:10:58 -08:00
Teravus Ovares (Dan Olivares)
fb08133999 * Remove the locklessqueue tests since I guess I didn't understand what it was when I wrote the test. 2009-10-30 19:24:14 -04:00
Teravus Ovares (Dan Olivares)
5101f688ee * Add LocklessQueueTests. One Test is commented out because it fails. It should probably work.. but I'm awaiting clarification. 2009-10-30 19:13:57 -04:00
Teravus Ovares (Dan Olivares)
2e81acec48 * Adding Tests for OpenSim.Framework.Cache. Some test cases disabled until mantis resolutions. 2009-10-30 18:13:58 -04:00
Teravus Ovares (Dan Olivares)
4563f00852 * Another ACL Test 2009-10-30 17:27:44 -04:00
Teravus Ovares (Dan Olivares)
120c731a3b * Moving A test from the OpenSim.Framework.ACL object to the OpenSim.Framework.Tests assembly. Fixing the test. 2009-10-30 17:04:10 -04:00
Melanie
1eb390beda Remove ThreadTrackerTest. It's no longer relevant because the thread 
tracker now uses the system thread list
 2009-10-08 08:32:34 +01:00
John Hurliman
2519f071f2 Fixing a few compile errors in the previous commit 2009-10-06 02:50:59 -07:00
John Hurliman
5dfd2643df * Change the signature of the agent set appearance callback to prevent unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes 
* Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures
* Properly handle appearance updates that do not have a TextureEntry set
 2009-09-30 15:53:03 -07:00
Teravus Ovares (Dan Olivares)
f34e89f385 * More Test tweaking to get down to the root cause of the test wierdness 2009-08-17 10:28:58 -04:00
Teravus Ovares (Dan Olivares)
bf8e07606f * handle litjson errors for now. We'll remove this when we hear back from http://jira.openmetaverse.org/browse/LIBOMV-675 2009-08-16 17:19:52 -04:00
Jeff Ames
9d9fcac038 Misc cleanup. 2009-08-16 17:14:21 +09:00
Teravus Ovares (Dan Olivares)
0781ac9a5e * Add ThreadTracker Tests, Tests default thread, Adding Testing and Removing a thread, a dead thread, and a null Thread 
* Fix a null thread situation
 2009-08-13 22:12:37 -04:00
Teravus Ovares (Dan Olivares)
7a761560c6 * Add AgentCircuitManager tests for adding, removing, changing circuit code, and authentication. 2009-08-13 21:01:39 -04:00
Teravus Ovares (Dan Olivares)
f5fc5226f8 * Adds two tests to OpenSim.Framework.Tests. *AgentCircuitData test to ensure that the Packing and unpacking method to and from OSD works as expected called, TestAgentCircuitDataOSDConversion. Also created a HistoricalAgentCircuitDataOSDConversion to ensure that any changes in the way the json wire format is parsed warns us via this test. 2009-08-13 18:10:09 -04:00
Mike Mazur
e6e88ac126 Give m_test* methods more reasonable names 
Changing the names of these methods because they were being picked up by
nunit as tests even though they were marked private. Naming them Check*
after the original Test*.
 2009-06-12 15:00:08 +00:00
Jeff Ames
840de6c036 Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00
Jeff Ames
6e19fb8593 Add copyright headers. 2009-04-14 10:56:24 +00:00
Jeff Ames
fa29cf5c50 Update svn properties. 2009-04-14 10:00:13 +00:00