aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2010-02-1416-326/+120
|\
| * Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522Justin Clark-Casey (justincc)2010-02-128-50/+50
| | | | | | | | | | | | These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login. The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems). Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
| * minor: remove completely commented out and unused classJustin Clark-Casey (justincc)2010-02-121-226/+0
| |
| * Fix http://opensimulator.org/mantis/view.php?id=4224Justin Clark-Casey (justincc)2010-02-128-50/+70
| | | | | | | | | | | | | | This resolves the problem where eyes and hair would turn white on standalone configurations When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it. This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white. This bug did not affect grids since they use a different service connector.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2010-02-082-2/+7
|\ \ | | | | | | | | | careminster
| * | Fix two inconsistencies with LightShareCasperW2010-02-052-2/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2010-02-0813-64/+175
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-082-18/+18
| |\
| | * endline fix 2Teravus Ovares (Dan Olivares)2010-02-061-6/+6
| | |
| | * Endline fixTeravus Ovares (Dan Olivares)2010-02-061-12/+12
| | |
| * | add some method doc to IDynamicTextureManagerJustin Clark-Casey (justincc)2010-02-081-2/+59
| | |
| * | refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in ↵Justin Clark-Casey (justincc)2010-02-082-5/+12
| | | | | | | | | | | | Scene.AddSceneObject since this wraps a check that is much less clear
| * | Add EventManager.OnIncomingSceneObject event which is triggered by an ↵Justin Clark-Casey (justincc)2010-02-084-17/+58
| | | | | | | | | | | | | | | | | | incoming scene object Add a read-only Attachments property to ScenePresence
| * | minor: log what kind of wearable cannot be foundJustin Clark-Casey (justincc)2010-02-052-5/+6
| |/
| * Revert "Old OpenSim installations may have no AssetCaching setting in ↵Justin Clark-Casey (justincc)2010-02-051-3/+1
| | | | | | | | | | | | | | | | config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)" This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules) This reverts commit 7058a4c2597a2b76704e906b73ae7077ff805b16.
| * Old OpenSim installations may have no AssetCaching setting in ↵Justin Clark-Casey (justincc)2010-02-051-1/+3
| | | | | | | | | | | | | | config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all) If this is the case, this patch makes CenomeAssetCache the default cache (which matches that selected in StandaloneCommon.ini.example) Not having an asset cache may lead to a continual loop of appearance baking failures and cause dynamic textures not to work, among other effects
| * refactor: chain two ScenePresence constructors together to eliminate common ↵Justin Clark-Casey (justincc)2010-02-042-16/+14
| | | | | | | | code. No functional changes
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-043-17/+17
| |\
| | * Applying patch #4534 by Misterblue to fix ODE physics stickinessJohn Hurliman2010-02-041-0/+2
| | |
| * | minor: one method docJustin Clark-Casey (justincc)2010-02-042-3/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2010-02-046-371/+1190
|\ \ \ | | |/ | |/|
| * | Revert "change position of OnAttach event firing so that this also happens ↵Melanie2010-02-042-17/+15
| |/ | | | | | | | | | | | | | | when a user teleports into a region" The behavior introduced here is not compatible with SL This reverts commit b6bee4999c9d238a052022f105069ea4eb85f8f4.
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-02-031-3/+3
| |\
| * | minor: remove one mono compiler warningJustin Clark-Casey (justincc)2010-02-031-3/+1
| | |
| * | minor: remove one mono compiler warningJustin Clark-Casey (justincc)2010-02-031-10/+8
| | |
| * | minor: add a smidgen of EventManager docJustin Clark-Casey (justincc)2010-02-032-6/+6
| | |
| * | For each delegate added to events in the EventManager, catch and log but do ↵Justin Clark-Casey (justincc)2010-02-031-314/+1128
| | | | | | | | | | | | | | | | | | not propogate any exceptions that come back This stops exceptions thrown by modules from disrupting the kernel and still allows other delegates to be executed normally
| * | add an IsRoot property to sopJustin Clark-Casey (justincc)2010-02-032-1/+24
| | |
| * | minor: comment out a log line in ScenePresenceJustin Clark-Casey (justincc)2010-02-031-2/+1
| | |
| * | minor: remove a couple of mono warningsJustin Clark-Casey (justincc)2010-02-032-4/+1
| | |
| * | change position of OnAttach event firing so that this also happens when a ↵Justin Clark-Casey (justincc)2010-02-032-15/+17
| | | | | | | | | | | | user teleports into a region
| * | refactor: move world comm message queueing into its own methodJustin Clark-Casey (justincc)2010-02-021-23/+13
| | |
* | | Line endings cleanupMelanie2010-02-041-36/+36
| | |
* | | Merge branch 'master' into careminsterMelanie2010-02-034-20/+60
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-02-034-17/+57
| |\ \ | | |/
| | * minor: copy some method doc from the WorldComm implementation to the interfaceJustin Clark-Casey (justincc)2010-02-021-0/+39
| | |
| | * minor: add method doc to sop.SetScriptEvents()Justin Clark-Casey (justincc)2010-02-021-0/+5
| | |
| | * minor: add some documentation to EventManager.OnObjectGrabJustin Clark-Casey (justincc)2010-02-021-15/+8
| | |
| | * minor: add reminder to lock SOG.Children before using it directly in order ↵Justin Clark-Casey (justincc)2010-02-021-2/+5
| | | | | | | | | | | | to avoid threading issues
| * | allow terrain collision events after regular collision checkradams12010-02-031-3/+3
| |/ | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminsterMelanie2010-02-0213-282/+472
|\ \
| * | Revert "improve locking of m_items in SceneObjectPartInventory"Melanie2010-02-021-133/+85
| |/ | | | | | | This reverts commit 968b9e160d70568fbdea5b190d1386e9431316e3.
| * minor: rename GetScriptPrimType() to GetPrimType()Justin Clark-Casey (justincc)2010-02-012-4/+4
| |
| * move hollow sphere faces bug back up to LSL_Api.csJustin Clark-Casey (justincc)2010-02-012-37/+52
| |
| * remove now duplicated shape code from LSL_Api.csJustin Clark-Casey (justincc)2010-02-012-194/+49
| |
| * Copy prim face color setting code from LSL_Api down into SOP so that non-LSL ↵Justin Clark-Casey (justincc)2010-02-012-1/+192
| | | | | | | | callers can use it
| * Actually make EventManager.OnAttach() fire when an object is attached. ↵Justin Clark-Casey (justincc)2010-02-012-2/+6
| | | | | | | | Previously, only detach was firing!
| * Don't try to start attachment scripts or send updates if the attachment ↵Justin Clark-Casey (justincc)2010-02-012-27/+64
| | | | | | | | itself has been unsuccessful
| * apply http://opensimulator.org/mantis/view.php?id=4486Justin Clark-Casey (justincc)2010-01-301-1/+1
| | | | | | | | | | fix compilation of mrm scripts using microthreaded parmeter Thanks ziah
| * Apply http://opensimulator.org/mantis/view.php?id=3334Justin Clark-Casey (justincc)2010-01-294-1/+58
| | | | | | | | | | | | Send continuous touch() events if the left mouse button is held down while moving over an object This conforms with Linden Lab practice Thanks Revolution