Commit Graph

4293 Commits

Author SHA1 Message Date
Melanie Thielker
93fa3777d2 Merge branch 'ubitworkmaster' 2014-10-03 18:27:27 +02:00
Melanie Thielker
c66e4eeb7d Also store names of assets in the AnimationSet 2014-10-03 18:27:14 +02:00
UbitUmarov
cfb1a27300 Merge branch 'master' into ubitworkmaster 2014-09-29 20:36:03 +01:00
Melanie Thielker
3ea76e3131 Make changes to AnimationSet to allow indexing by names rather than indices. Add some debugging output and prepare for parsing an ascii-based format. 2014-09-27 02:30:01 +02:00
UbitUmarov
bb019945e8 change permitions again 2014-09-26 15:20:45 +01:00
UbitUmarov
46caea6987 change it again... 2014-09-26 15:03:33 +01:00
UbitUmarov
90cad82405 remove unnecessary argument ref 2014-09-26 14:22:54 +01:00
UbitUmarov
fcad64209c make c# more happy 2014-09-26 14:17:01 +01:00
UbitUmarov
3e2242b4c4 change animset permitions to reflect no transfer nature 2014-09-26 14:06:16 +01:00
UbitUmarov
cce31b6638 add centerlized AnimationSet item permitions setting 2014-09-26 14:00:33 +01:00
Melanie Thielker
546537c056 Rename = too generic 2014-09-25 21:54:32 +02:00
Melanie Thielker
2e6fd6536b Add the AnimationSet skel 2014-09-25 21:53:32 +02:00
Melanie Thielker
80f3e8edbc Fix stupid stuff. 2014-09-24 00:21:14 +02:00
Melanie Thielker
a6b27a7aa4 Add a link number field to ColliderArgs 2014-09-24 00:16:04 +02:00
Melanie Thielker
0bfba122f0 When a ghosted avatar is removed, also remove any remaining CAPS 2014-09-22 18:49:08 +02:00
Melanie Thielker
640f3f3074 A stab at brute force fixing the locking - one, make m_itemLock volatile, two,
reset the lock even if the write lock is not apparently held.
2014-09-21 19:24:15 +02:00
UbitUmarov
df389dceb8 add some _response.close. RestClient still looks bad. It should be a
proper IDisposable object.
2014-09-17 16:19:00 +01:00
UbitUmarov
9bf3e2a257 dispose some tmp streams 2014-09-17 15:36:22 +01:00
UbitUmarov
016e58e354 *test* 2014-09-09 21:53:27 +01:00
UbitUmarov
7351d92a76 add method to get a category throttle rate 2014-08-29 16:19:30 +01:00
UbitUmarov
63d1916f51 Remove entities from updates queues on kill. Do it sync so enqueues after
the kill work
2014-08-23 20:59:11 +01:00
UbitUmarov
5bf145a397 add a direct sendpartfullUpdate to send a full object update to a part,
optionally overriding its parentID. check what it does to attachments
2014-08-21 00:49:10 +01:00
UbitUmarov
88587b4e73 reserve updates priority queue 2 for attachments, send them by it on
BestAvatarResp scheme. Attachments cannot be sent on imediate queues,
 since they will block everything. Changed distance to priority math,
 keeping identical result, shifted to start at queue 3.
2014-08-20 21:41:16 +01:00
UbitUmarov
ff518e7cbb make webutilmore verbose on PUT for avatar updates. Reduce LargeTime debug
level to 500ms from 3000ms
2014-08-17 02:12:45 +01:00
UbitUmarov
447fd0850a remove duplication of textures, wearables and attachments on crossings.
receiver checks old method if it doesnt get packed appeareace
2014-08-15 21:39:37 +01:00
UbitUmarov
8c657e4837 add a estimator of client ping time, and painfully make it visible in show
connections console command
2014-08-14 20:41:36 +01:00
UbitUmarov
395903d58f *DANGER* dont send baked textures assets to Neighbours. Possible we could
send a lot less
2014-08-14 02:36:50 +01:00
UbitUmarov
a1cc218f10 *DANGER* make baked textures cross and make use of it * UNTESTED *
issue:  alll this seems to be sent back to childs, need to stop that
2014-08-14 01:53:51 +01:00
UbitUmarov
3e7f475e58 fix the damm thing 2014-08-12 21:08:01 +01:00
Melanie Thielker
ddfb05e57a Comment out stupid XEngine-bound message about script vs non-script startup, it's annoyed me for a long time. Comment out periodic stats as well, they've never been useful to us and just cause console spew. 2014-08-09 05:31:09 +02:00
UbitUmarov
998e3d435a DANGER back to right current max number of wearables ( TP out of regions
with this may kill old regions)
2014-08-08 01:39:19 +01:00
UbitUmarov
16bcd86dfb back to max 15 wearables until its safe ( and before i kill other grid
regions)
2014-08-08 00:01:49 +01:00
UbitUmarov
a8e49a4538 max 16 for testing 2014-08-07 23:33:48 +01:00
UbitUmarov
4ae0bb7df1 add limites checks on wearables size, revert to max 15 for
compatibility/testing
2014-08-07 23:29:31 +01:00
UbitUmarov
7486684436 update the max number of texture faces and wearables to current values.
This should be safe now..
2014-08-07 22:47:29 +01:00
UbitUmarov
c3f9c99fb3 DANGER... changed bakedtextures caching. Assuming grid baking is cache
only, reduced number of accesses to it. TESTING
2014-08-07 05:20:45 +01:00
UbitUmarov
6eca2475d4 dont assume that all zero folded perms are to ignore ( coerence with old
code in avn-current )
2014-08-05 17:55:30 +01:00
UbitUmarov
a5e9429f2b MESS: changes in MakeRootAgent and CompleteMovement reordering things.
Added sending of land overlay and parcel information. This in order to
only send avatar related information after having its position well
defined and on the right parcel. THIS MAY STILL BE BAD :)
2014-07-31 03:10:50 +01:00
UbitUmarov
d6dbfd1687 missing file in commit 5fe1f87837 2014-07-30 15:43:54 +01:00
Melanie Thielker
0c2537bb24 Try to plumb the other half 2014-07-29 04:41:38 +02:00
Melanie Thielker
dfa9780c8c Send new parcel permissions to activate viewer options - done right this time 2014-07-29 04:19:01 +02:00
UbitUmarov
86a9710e77 change previus code, send a NoEvents response back to http server, even
if we know there is no one there, so that the server finishes handling
 it.
2014-07-24 23:32:39 +01:00
UbitUmarov
05d071a430 let BlockingQueue timeout work as its suposed to and not wait for ever 2014-07-24 05:37:56 +01:00
UbitUmarov
f236b2e5d3 request.DoHTTPGruntWork(..) is now identical to our version, so use
those again, getting code closer to os
 again
2014-07-23 02:14:15 +01:00
Melanie Thielker
e1b2ecdfdc Merge branch 'avination-current'
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2014-07-19 22:32:07 +02:00
UbitUmarov
19d33c571d Merge branch 'avination-current' into ubitwork 2014-07-16 16:22:32 +01:00
Melanie Thielker
159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00
Melanie Thielker
1d1e444aed Convert region loading to new format 2014-04-26 02:43:13 +02:00
Melanie Thielker
5c661baf6c Allow opening a https port using only http so that nginx can be used for ssl 2014-04-26 02:42:30 +02:00
Melanie
c6e9db5866 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00