OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,550 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

19550 Commits (646b7fb8f2e285945b70a657674e5c3dac84b931)

Author SHA1 Message Date
Melanie f8b1b86c3a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2012-03-07 01:05:32 +00:00
Melanie a1b28a61a6 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-03-07 01:04:09 +00:00
Melanie 7769362687 Always zero the PhysActor on dupes to prevent side effects on the orignal prim 2012-03-07 01:03:26 +00:00
Melanie 5884d08062 Fix merge issue 2012-03-07 00:58:01 +00:00
Melanie caa19862fa Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-07 00:51:59 +00:00
Melanie f3e04beb2e Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-03-07 00:51:24 +00:00
Justin Clark-Casey (justincc) f3678d217f Stop individually deleting objects at the end of each ObjectTortureTest. 
We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests.
This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in).
Slightly simplifies config read in Scene constructor to help facilitate this.
 2012-03-07 00:31:18 +00:00
Justin Clark-Casey (justincc) 23aba007dd Add documentation to make more explicit the difference between OnRezScript and OnNewScript in the event manager 
OnNewScript fires when a script is added to a scene
OnRezScript fires when the script actually runs (i.e. after permission checks, state retrieval, etc.)
 2012-03-07 00:04:24 +00:00
Justin Clark-Casey (justincc) 3376979923 Remove static m_MainInstance in LocalGridServiceConnector. 
I believe this was originally required back when there could be two LocalGridServiceConnectors but this is no longer the case.
Having such statics makes performance testing much more difficult since they prevent GC of objects unless static references are explicitly nulled.
 2012-03-06 23:51:50 +00:00
Justin Clark-Casey (justincc) 98251cdab3 Add sensor, dataserver requests, timer and listener counts to "xengine status" command. 
This is for diagnostic purposes.
 2012-03-06 23:21:17 +00:00
Justin Clark-Casey (justincc) e9d8eb5a27 Remove unnecessary explicit ElapsedEventHandler in SimReporter 2012-03-06 22:31:25 +00:00
Melanie 0be4ed3df4 Prevent scripted region crossings from crashing with prim limits enabled 2012-03-06 22:27:01 +01:00
Melanie 17b1454d6f Null PhysActor on SOP.Copy() to prevent clobbering the original one 2012-03-06 20:20:12 +01:00
Justin Clark-Casey (justincc) 0f4cdc0c5b Explictly close down the StatsReporter so that we can shutdown its timer 
This is another step necessary for the scene to be garbage collected between performance tests
 2012-03-06 19:05:32 +00:00
Melanie de03d1ece0 Removed some whitespace errors - don't be naughty, don't use hard tabs! 
Also removed commented code block.
 2012-03-06 09:56:19 +01:00
UbitUmarov cca94aaefc make copied parts have diferent LocalIds than original. More building control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED 2012-03-06 05:13:39 +00:00
UbitUmarov f33654b62f Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-03-06 03:07:48 +00:00
Justin Clark-Casey (justincc) b3449e998a Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop() 
They were all failing assertions but the exceptions these threw were caught as expected Exceptions.
I don't think we can easily distinguish these from the Exceptions that we're expecting.
So for now we'll do some messy manually checking with boolean setting instead.
This patch also corrects the assertions themselves.
 2012-03-06 02:30:22 +00:00
Justin Clark-Casey (justincc) a92153ed88 Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that they're running 2012-03-06 02:21:19 +00:00
Justin Clark-Casey (justincc) 85198a45cb Fix off by one error in script error reporting. 2012-03-06 02:01:47 +00:00
Justin Clark-Casey (justincc) 1dc03e5c4f Simplify NPCModuleTests code by putting the NPCModule in an instance variable rather than making each test fetch it seperately. 
Also rename instance variables in the test to conform to naming standards and for understandability
 2012-03-06 01:47:43 +00:00
Melanie 5004d0ad09 Merge branch 'master' into careminster 2012-03-06 01:45:20 +00:00
Justin Clark-Casey (justincc) d44b7c486a Go back to setting appearance directly in NPCModule.SetAppearance() to fix mantis 5914 
The part reverted is from commit 2ebb421.
Unfortunately, IAvatarFactoryModule.SetAppearance() does not transfer attachments.
I'm not sure how to do this separately, unfortunately I'll need to leave it to Dan :)
Regression test added for this case.
Mantis ref: http://opensimulator.org/mantis/view.php?id=5914
 2012-03-06 01:27:30 +00:00
Melanie af46650bae Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
 2012-03-06 01:18:37 +00:00
Melanie aa613dab1f Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-03-06 00:29:43 +00:00
Melanie 5e77973667 Merge branch 'master' into careminster 2012-03-06 00:29:25 +00:00
Chris Hart 413bc1e77e Updates to MSSQL store for 0.7.3 to include: 
* Telehub support
* Bugfix to Friends lookups
* Updates to Creator fields to store up to 255 characters for HG item creator storage
 2012-03-06 00:27:49 +00:00
Justin Clark-Casey (justincc) 441449e240 Switch to sha256 from sha1 in order to avoid future asset hash collisions. 
Some successful collision attacks have been carried out on sha1 with speculation that more are possible.
http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms
No successful attacks have been shown on sha256, which makes it less likely that anybody will be able to engineer an asset hash collision in the future.
Tradeoff is more storage required for hashes, and more cpu to hash, though this is neglible compared to db operations and network access.
 2012-03-06 00:14:21 +00:00
Justin Clark-Casey (justincc) fd2b285b1b remove unnecessary hash local variable 2012-03-05 23:50:41 +00:00
Melanie a7b61add99 Allow NPC to be removed by the owner of the parcel they're over. 
Don't allow NPC creation unless the prim owner has rez rights.
 2012-03-05 22:22:28 +01:00
Melanie f2653b9b8e Teleport users to the cornfield when they are teleported with 
llTeleportAgentHome(). Don't try to teleport NPCs.
 2012-03-05 21:52:24 +01:00
UbitUmarov 7377e633c7 update ubitOde 2012-03-05 12:37:21 +00:00
Melanie 97f0cff388 llListSort SL compatibility: When sorting strided list and the list 
length is not a multiple of the stride, return the original list.
Also, enforce that sort is ascending only when the ascending
parameter is 1, and not when it is != 0
 2012-03-05 11:54:06 +01:00
UbitUmarov a647a37683 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-03-05 04:03:37 +00:00
Melanie c2a73a26b5 SL compatibility - return only points on segemtn, not ray in llCastRay 2012-03-05 02:37:51 +01:00
Melanie 0ed4f24b34 A stab at making llEjectFromLand work in all cases 2012-03-05 02:14:27 +01:00
Melanie 182f5efbe9 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-03-04 16:23:46 +00:00
Melanie 6338996f87 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
 2012-03-04 16:23:19 +00:00
BlueWall ac934e2dbb Add WebProfiles config to other config example 2012-03-04 11:11:01 -05:00
BlueWall 33a154e446 Merge branch 'master' of /home/opensim/var/repo/opensim into v3_support 2012-03-04 10:42:37 -05:00
UbitUmarov 01fcd400d7 update UbitOde 2012-03-04 04:26:05 +00:00
UbitUmarov 99bb3ccb3d Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-03-04 04:11:38 +00:00
UbitUmarov 7c931037bd update UbitODE 2012-03-04 01:40:12 +00:00
Melanie 6dc4a6dfb1 Zero velocity when drag-copying 2012-03-04 00:06:07 +01:00
UbitUmarov fc781f0894 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-03-03 17:08:01 +00:00
Melanie 1f32730798 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2012-03-03 09:58:57 +00:00
Justin Clark-Casey (justincc) 3780df8a32 Make asset compression optional. Currently set to false and not configurable from outside MySQLXAssetData. 2012-03-03 01:43:36 +00:00
Justin Clark-Casey (justincc) 75dc8b1aed Implement basic gzip compression for xassetdata 
Whether this is worthwhile is debatable since here we are not transmitting data over a network
In addition, jpeg2000 (the biggest data hog) is already a compressed image format.
May not remain.
 2012-03-03 01:28:58 +00:00
Justin Clark-Casey (justincc) 2535a4cafc If asset data already exists with the required hash then don't rewrite it 2012-03-03 00:05:02 +00:00
Justin Clark-Casey (justincc) 94b323d1d8 Perform asset storage transactionally 2012-03-02 23:41:54 +00:00