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

20457 Commits (be22e3599cece284f981d0a98224dd563c3d933f)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 9fac7fd932 refactor: In llGetInventoryType() use existing GetInventoryItem() 2012-07-04 21:50:52 +01:00
Justin Clark-Casey (justincc) f2b0377c28 refactor: In llGetInventoryCreator() use existing GetInventoryItem() 2012-07-04 21:49:21 +01:00
Justin Clark-Casey (justincc) d933bdbd59 refactor: In llGetInventoryPermMask() use existing GetInventoryItem() 2012-07-04 21:47:20 +01:00
Justin Clark-Casey (justincc) f9fa34408d refactor: in llGetInventoryPermMask use existing GetInventoryItem() 2012-07-04 21:42:04 +01:00
Justin Clark-Casey (justincc) 857494f6bd refactor: In llRemoteLoadScriptPin() use existing GetInventoryItem() 2012-07-04 21:36:44 +01:00
Justin Clark-Casey (justincc) dff7cae2ee refactor: replace use of LSL_Api.GetTaskInventoryItem() with existing GetInventoryItem() 2012-07-04 21:33:35 +01:00
Justin Clark-Casey (justincc) 0e3fce9b5c refactor: In llGetInventoryKey() use existing GetInventoryItem() 2012-07-04 21:25:58 +01:00
Justin Clark-Casey (justincc) 4b2b14dad1 In llMessageLinked() use GetInventoryItems() rather than cloning TaskInventory directory 
GetInventoryItems() returns a new list and so is equivalent, and creates this list under lock whereas Clone() is not thread-safe
 2012-07-04 21:22:43 +01:00
Justin Clark-Casey (justincc) 3769739ca7 In llRequestInventoryData() use GetInventoryItems() rather than cloning TaskInventory directory 
GetInventoryItems() returns a new list and so is equivalent, and creates this list under lock whereas Clone() is not thread-safe
 2012-07-04 21:19:16 +01:00
Justin Clark-Casey (justincc) 3717812ce0 refactor: In llCollisionSound() use existing GetInventoryItem() method rather than have it iterate through TaskInventory itself. 2012-07-04 21:15:00 +01:00
Justin Clark-Casey (justincc) ae64d089c6 refactor: In llRemoveInventory() use existing GetInventoryItem() method rather than have it iterate through TaskInventory itself. 2012-07-04 21:05:51 +01:00
Justin Clark-Casey (justincc) 58b13d51a7 refactor: make llGiveInventory() use existing GetInventoryItem() method rather than iterate through TaskInventory itself. 2012-07-04 20:57:48 +01:00
ubit 21ecc1a695 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-04 18:59:42 +02:00
UbitUmarov bc5d554f54 use the pollEvent timeout paramenter on pooling 2012-07-04 17:58:32 +01:00
ubit c5d2151674 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-04 18:41:36 +02:00
UbitUmarov 02cb0bf80a added a timeout paramenter to PollServiceEventArgs, so each type can define it's timeout 2012-07-04 17:40:02 +01:00
ubit 5a09964c25 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-04 16:11:47 +02:00
UbitUmarov e533eef962 *test2* http poll: increased again the pool rate do 10/s but increased timeout to 1s. So data there is less delay when there is new data, but enought waiting time for it to be avaiable 2012-07-04 15:07:10 +01:00
ubit 47170ba753 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-04 07:16:27 +02:00
UbitUmarov b2fa20001f *test* slow http retries pool rate to original 1s 2012-07-04 06:14:47 +01:00
ubit a5247448c5 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-04 05:19:44 +02:00
Justin Clark-Casey (justincc) 5691a8b860 refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS to reflect what it actually is 2012-07-04 00:15:03 +01:00
Justin Clark-Casey (justincc) f7b4802577 Correct spelling mistake m_BanedViewers to m_BannedViewers 2012-07-03 23:26:02 +01:00
Justin Clark-Casey (justincc) 8183c2926d minor: Add some method doc to HasGroupChanged and Schedule GroupForFull/PartUpdate() to indicate when region modules need to invoke them 2012-07-03 23:19:11 +01:00
Justin Clark-Casey (justincc) 3c9b9a848f Fix issue in database tests where sogs being stored are not in a scene. 
This puts an extra m_part.ParentGroup.Scene == null check at the top of SceneObjectPartInventory.QueryScriptStates()
 2012-07-03 22:58:58 +01:00
Michelle Argus 3399596e0e Adds a list of viewers that are allowed or banned from the region. 
Signed-off-by: Melanie <melanie@t-data.com>
 2012-07-02 18:45:11 +01:00
Melanie 13640a256a Merge branch 'ubitwork' into avination 2012-07-02 02:09:15 +02:00
Melanie 4f04ec5fc2 Implement the buggy version of llXorBase64Strings() for compatibility's sake 2012-07-02 02:04:56 +02:00
Melanie 736d3d269f Merge branch 'master' into careminster 2012-07-01 18:32:00 +01:00
Melanie d32cf21576 Add preservation of running state of scripts when drag-copying. 2012-07-01 18:30:59 +01:00
Melanie 7eb95c9ed9 Bring casing of llSHA1String in line with SL 2012-07-01 18:05:35 +02:00
Melanie e5eef139ed Merge branch 'master' into careminster 2012-07-01 03:04:23 +01:00
ubit c5d4918b34 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-07-01 02:42:10 +02:00
UbitUmarov d3f1fc79e5 *TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued to unified requests queue directly. Retries get into that every 100ms. 3 working threads as before plus another that only does retries timming. 2012-07-01 01:33:20 +01:00
UbitUmarov 96270b1b28 Merge branch 'avination' into ubitwork 2012-07-01 00:08:31 +01:00
UbitUmarov ec7c7fe5f8 ubitode: create and use 4 off world collision spaces for offworld static prims 2012-06-30 08:49:07 +01:00
Justin Clark-Casey (justincc) 1926de5a05 Remove some mono compiler warnings 2012-06-30 01:25:39 +01:00
Justin Clark-Casey (justincc) a4551b027b Removing unused handling of incoming create object by userID and itemID only. 
It appears this was never actually used since attachments were rezzed in other code.
This was never available on remote simulator comms, only local.
 2012-06-30 01:14:49 +01:00
Justin Clark-Casey (justincc) 56c776066c Remove code listed for removal in 0.7.3 that handled script restart for incoming attachments from pre-fatpack regions (versions of OpenSimulator more than a year old) 2012-06-30 01:06:37 +01:00
Melanie 6137f37028 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-06-29 22:24:53 +01:00
Melanie 05cf51cbbd Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
 2012-06-29 22:11:49 +01:00
Melanie e9e409a794 Remove spammy debug 2012-06-29 22:37:16 +02:00
ubit 1d628ebaa3 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-06-29 04:45:38 +02:00
UbitUmarov 38cdf77cef in CreateAvatarUpdateBlock() change updateflags to 0. Original flags seem prim related only. This does fix the wrong viewer side move of a avatar in prim edition mode (anv mantis 854), with no apparent side effects .. may need more testing 2012-06-29 03:41:04 +01:00
Melanie 2870659b5c Merge branch 'ubitwork' into avination 2012-06-29 04:03:24 +02:00
ubit 8ebc6e9090 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-06-29 02:20:54 +02:00
UbitUmarov 7ab8bc0a60 don't recoil attachments doing llRezObject() 2012-06-29 01:17:53 +01:00
Justin Clark-Casey (justincc) 0229e90dcc Move update of the final optional ODE total frame stat inside the OdeLock rather than outside to avoid a very occasional race condition with the stat collection thread 2012-06-29 01:02:35 +01:00
UbitUmarov 58b4417140 Merge branch 'avination' into ubitwork 2012-06-29 01:00:38 +01:00
Justin Clark-Casey (justincc) e420f815dc refactor: rename _collisionEventPrim to m_collisionEventActors and _collisionEventPrimChanges to m_collisionEventActorsChanges to reflect their actual contents. 
These dictionaries handle all actor types, not just physical prims.
 2012-06-29 00:54:40 +01:00