Commit Graph

21340 Commits (0c5b36a4f700e6944f743b33e8b8d2d5fe565f93)

Author SHA1 Message Date
Diva Canto 7a50705188 Removed the bits about the TOSModule. That module doesn't go into core. WARNING: migration on GridUser withdrawn too, but left the migration number there. 2012-09-27 16:43:18 -07:00
Melanie f05ca1a0fe Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-09-28 00:15:58 +02:00
Melanie 7e21ddeeff Fix a possible NRE 2012-09-28 00:15:14 +02:00
UbitUmarov 58e55ae075 make some forgotten changes be done by simulation thread not by caller 2012-09-27 23:14:42 +01:00
Melanie 285039949c Update the Http server with a few additional properties. Adapt the test
server code to match.
2012-09-27 18:27:49 +01:00
Melanie 001ec0e2e6 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-27 17:29:44 +01:00
Melanie b52311b8f8 Remove a core undo call that we don't need. 2012-09-27 17:16:39 +01:00
Melanie 62d7350ae4 Merge branch 'master' into careminster 2012-09-27 15:49:19 +01:00
Melanie 9c9b3c1787 Merge commit '2bf42f30af5030890b8e3ff5bb29074a1f0e9085' into careminster 2012-09-27 15:49:14 +01:00
Justin Clark-Casey (justincc) 9eca154bce Make it possible to rescale SOGs when they are not in a scene. 2012-09-27 15:48:47 +01:00
Melanie 33bbb107c1 Merge commit '327320d1a7acbba969d26c281f92f64ce8ff365f' into careminster 2012-09-27 15:47:26 +01:00
Melanie 637f5440fe Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster 2012-09-27 15:46:35 +01:00
Melanie 40d6aac4b0 Merge commit 'ddd9384b3901f532243c1e8018334385b84290d1' into careminster 2012-09-27 15:29:03 +01:00
Justin Clark-Casey (justincc) fdd4361928 Fix very recently introduced race condition where a CreateNewItem outracing an UploadAsset request could throw an exception because m_asset did not yet exist.
This was accidentally introduced in 4fc0cfb
This commit also consistently removes the AssetXferUploader when the transaction completes, no matter if it completed on asset upload or item operation.
The amount of data being retained was small, since this was clothing/bodypart metadata in the asset rather than textures themselves.
2012-09-27 15:28:43 +01:00
Justin Clark-Casey (justincc) 7d6ac75f87 Comment out old m_storeLocal from AssetXferUploader.
This was only used if none of new item, update item or update task item had been set.
But since all transactions go through these paths this old code is redundant.
2012-09-27 15:27:56 +01:00
BlueWall 1efa87ba38 Format OpenSim.ini.example
Make lines fint in 80x24 terminal for easier reading
2012-09-27 15:27:39 +01:00
Justin Clark-Casey (justincc) 5c8b9ff9ed Insert transaction ID into AssetXferUploader constructor rather than at UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first.
This was preventing the previous race condition fix in 4fc0cfb from actually working.
This commit also removes some of the pointless transaction id checks - these conditions are already being enforced in AgentAssetsTransactions.
2012-09-27 15:27:25 +01:00
Justin Clark-Casey (justincc) 65e294267d Move UDP update task item code to AssetXferUploader to match existing create user item and update user item mechanisms
This is done for consistency and to allow removal or some access methods that increase code complexity.
However, this path has not been used for a long time, not even by LL 1.23 - viewers use caps http upload for this instead
2012-09-27 15:26:58 +01:00
Justin Clark-Casey (justincc) 1a902fceb5 Fix occasional race condition failure when creating new clothing/body parts in the viewer or updating existing assets.
On creating these items, the viewer sends a UDP AssetUploadRequest followed by a CreateInventoryItem.
It was possible for the CreateInventoryItem/UpdateInventoryItem to occasionally outrace the AssetUploadRequest and fail to find an initialized Xfer object, at which point the item create would fail.
So instead we always set up a Xfer object on either the asset or inventory item update request.
This does not introduce a new race because code already exists to delay the item operation until the asset is uploaded if necessary (but this only worked if the xfer object already existed)
2012-09-27 15:25:32 +01:00
nebadon 0e5d3d051b another osgitbot test from github.. mistakes were made! 2012-09-27 06:51:14 -07:00
nebadon f5fac2c916 another test to see if gitbot is alive yet 2012-09-27 06:37:43 -07:00
Melanie daf84d7385 Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminster 2012-09-27 12:39:24 +01:00
nebadon 581e76942f just testing to see if pcampbot is alive yet 2012-09-26 17:49:48 -07:00
UbitUmarov a0065ad616 create a new PollServiceHttpRequest req per loop since they can be sent to
another working thread
2012-09-27 00:14:50 +01:00
Justin Clark-Casey (justincc) 2bf42f30af Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.
This controls how many undo steps the simulator will store for each prim.
Default is now 20 rather than 5 as it briefly was.
The default number could be increased through this is a memory tradeoff which will scale with the number of prims in the sim and level of activity.
2012-09-27 00:12:34 +01:00
Justin Clark-Casey (justincc) b9934fc4db Don't store undo states if a scene object is manipulated when it is not in a scene.
Adds regression test for this.
2012-09-26 23:31:10 +01:00
Justin Clark-Casey (justincc) 31c636f1e4 refactor: Change control structures in SOP.StoreUndoState() to reduce nesting. 2012-09-26 23:25:50 +01:00
Justin Clark-Casey (justincc) 36e3123069 Make it possible to rescale SOGs when they are not in a scene. 2012-09-26 23:17:21 +01:00
Justin Clark-Casey (justincc) 327320d1a7 Enforce existing 5 action hardcoded undo limit.
This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source.
This commit enforces that limit, which will soon become configurable.
Regression test for undo limit added
Should help with http://opensimulator.org/mantis/view.php?id=6279
2012-09-26 22:49:44 +01:00
Justin Clark-Casey (justincc) 21f30a1b5f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-09-26 22:49:05 +01:00
Melanie 6cf51c329a Merge branch 'ubitwork' into avination 2012-09-26 23:49:02 +02:00
Melanie 2998a2df6a Streamline and improve llGetMass 2012-09-26 22:30:09 +02:00
Justin Clark-Casey (justincc) 90dd5844d6 Add basic undo/redo regression tests. 2012-09-26 21:28:43 +01:00
UbitUmarov a70352db17 don't send a partial contents report if we are sending all data 2012-09-26 21:03:31 +01:00
Diva Canto 3c77b8f463 Use GridUser properly for foreign users. 2012-09-26 12:40:41 -07:00
UbitUmarov c3ea00f16e add assettype mesh to list of binary assets 2012-09-26 20:31:34 +01:00
Diva Canto 80133f9ebe Show the user's home url too on the console command. 2012-09-26 11:27:31 -07:00
Diva Canto 2f61763923 Not really a change, just added a reminder to fix something here. 2012-09-26 11:26:51 -07:00
UbitUmarov 9a04269644 fix GetTextureHandler range 2012-09-26 16:49:39 +01:00
UbitUmarov be9cef8682 missing file 2012-09-26 16:20:26 +01:00
UbitUmarov 617f1b9223 just remove the damm thing 2012-09-26 16:17:49 +01:00
UbitUmarov 7e3eba1064 Seems nothing actually need the request body for getevents. so change
control flag to false
2012-09-26 15:41:57 +01:00
UbitUmarov abb4b9fcae UriModule GetEvents also doesn't need a request body 2012-09-26 15:11:59 +01:00
UbitUmarov 67fa657746 keep watchdog happy using it to kill his threads 2012-09-26 04:52:19 +01:00
Diva Canto 7d2cd0d935 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-09-25 20:04:10 -07:00
Diva Canto ae58cf4224 TOS module. WARNING: migration in GridUser table. 2012-09-25 20:03:49 -07:00
Diva Canto 495a3e7daf Oops, that should be inside the curly bracket. 2012-09-25 19:54:42 -07:00
UbitUmarov 654dd289f2 more changes to PollService 2012-09-26 03:05:27 +01:00
UbitUmarov 5d986002fd fix priorityQueue to correctly use the fairness counts starting at 8 for
nonimediate queues. Imediate queues where not taken into account so it
 was unused.
2012-09-26 00:17:54 +01:00
Justin Clark-Casey (justincc) 92afa6aa44 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-09-25 23:32:52 +01:00