6511c3b5c6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-27 16:43:38 -07:00
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
0e5d3d051b
another osgitbot test from github.. mistakes were made!
2012-09-27 06:51:14 -07:00
f5fac2c916
another test to see if gitbot is alive yet
2012-09-27 06:37:43 -07:00
581e76942f
just testing to see if pcampbot is alive yet
2012-09-26 17:49:48 -07:00
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
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
31c636f1e4
refactor: Change control structures in SOP.StoreUndoState() to reduce nesting.
2012-09-26 23:25:50 +01:00
36e3123069
Make it possible to rescale SOGs when they are not in a scene.
2012-09-26 23:17:21 +01:00
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
21f30a1b5f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-26 22:49:05 +01:00
90dd5844d6
Add basic undo/redo regression tests.
2012-09-26 21:28:43 +01:00
3c77b8f463
Use GridUser properly for foreign users.
2012-09-26 12:40:41 -07:00
80133f9ebe
Show the user's home url too on the console command.
2012-09-26 11:27:31 -07:00
2f61763923
Not really a change, just added a reminder to fix something here.
2012-09-26 11:26:51 -07:00
7d2cd0d935
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 20:04:10 -07:00
ae58cf4224
TOS module. WARNING: migration in GridUser table.
2012-09-25 20:03:49 -07:00
495a3e7daf
Oops, that should be inside the curly bracket.
2012-09-25 19:54:42 -07:00
92afa6aa44
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 23:32:52 +01:00
ddd9384b39
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
2012-09-25 23:30:25 +01:00
4dc27aa91f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 18:14:06 -04:00
b96a53962b
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-25 23:13:45 +01:00
3c2fb77133
Format OpenSim.ini.example
...
Make lines fint in 80x24 terminal for easier reading
2012-09-25 18:13:32 -04:00
eb5bec96e4
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
2012-09-25 22:54:20 +01:00
2f795e4fa6
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-25 22:08:11 +01:00
4fc0cfba3c
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-25 21:35:39 +01:00
77355295da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-25 10:46:42 -07:00
4ec2fc4cc2
Deleted extraneous debug message
2012-09-25 10:46:21 -07:00
020103c51e
Documenting object-related events
2012-09-24 22:59:02 +01:00
ac02cadbdb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-24 22:52:33 +01:00
1cfd63d0b4
Documenting LSL script-related events
2012-09-24 22:44:37 +01:00
1c42337381
HG Rez object: warn the user if the item or asset cannot be found.
2012-09-22 14:41:19 -07:00
87d810217e
Guard against inventory get failures.
2012-09-22 14:01:51 -07:00
772aedc731
Make BaseHttpServer throws say something useful.
2012-09-22 14:01:07 -07:00
fb6d6e5cca
HG 2.0: User Agent Service now can also control where the local users can go. Domain-name and user-level based. \o/
2012-09-22 11:11:48 -07:00
48f4b32d7f
More HG 2.0: access control at the Gatekeeper. \o/
2012-09-21 21:03:14 -07:00
ebd99c9e3e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 17:59:42 -07:00
21a6ef5bb6
This fixes HG attachments' missing assets (textures, etc).
...
Also, further improvements on HGUuidGatherer: if the assets are already in this grid don't fetch them again.
2012-09-21 17:58:44 -07:00
a6f7328216
Remove deprecated parameters for region_id.
...
Remove deprecated parameters for region_id as anounced in january 2012.
2012-09-22 01:30:38 +01:00
b36ef60aca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-22 01:05:33 +01:00
8d7b1f8aa0
Documenting non-LSL script-related events
2012-09-22 00:57:29 +01:00
b0da4b8d13
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 16:45:35 -07:00
cfa022700d
Moved the small HGUuidGatherer class to the file where its parent class is. No need to keep 2 separate files.
2012-09-21 16:45:16 -07:00
9ab5c5040d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-22 00:26:32 +01:00
5df3944607
Fix llListFindList() returning no match when there is a match with a script constant component in the source list.
...
Adds regression test for this case.
Based on http://opensimulator.org/mantis/view.php?id=6156
Thanks SignpostMarv.
2012-09-22 00:23:25 +01:00
fb2ace6fff
Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already downloads the assets, so we don't need to do it again...
2012-09-21 15:55:58 -07:00
f931c0a868
Minor: may avoid crashes of sims that still don't have this configuration section.
2012-09-21 15:04:41 -07:00
f4cc19968c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-09-21 07:45:26 -07:00
b542622b3a
HG 2.0: added asset import/export policies at the sim too.
2012-09-21 07:44:18 -07:00
5f97b3e1d9
Minor: change the return value of unsuccessful posts to string.Empty.
2012-09-21 06:41:32 -07:00
Diva Canto